arm: Remove a redundant check in fmtconvert_init_arm.c
authorMartin Storsjö <martin@martin.st>
Mon, 23 Oct 2017 07:44:53 +0000 (10:44 +0300)
committerMartin Storsjö <martin@martin.st>
Tue, 24 Oct 2017 06:07:01 +0000 (09:07 +0300)
This was missed in e2710e790c0, where have_vfp && !have_vfpv3 were
converted into have_vfp_vm.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/arm/fmtconvert_init_arm.c

index 11396e8..70c8023 100644 (file)
@@ -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)) {