This was missed in e2710e790c0, where have_vfp && !have_vfpv3 were
converted into have_vfp_vm.
---
libavcodec/arm/fmtconvert_init_arm.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/arm/fmtconvert_init_arm.c
b/libavcodec/arm/fmtconvert_init_arm.c
index 11396e898c..70c8023aa2 100644
--- a/libavcodec/arm/fmtconvert_init_arm.c
+++ b/libavcodec/arm/fmtconvert_init_arm.c
@@ -42,10 +42,8 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c,
AVCodecContext *avctx
int cpu_flags = av_get_cpu_flags();
if (have_vfp_vm(cpu_flags)) {
- if (!have_vfpv3(cpu_flags)) {
- c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp;
- c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp;
- }
+ c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp;
+ c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp;
}
if (have_neon(cpu_flags)) {
--
2.13.5 (Apple Git-94)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
