[FFmpeg-cvslog] arm: Remove a redundant check in fmtconvert_init_arm.c

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Oct 23 10:44:53 2017 +0300| [b487add7ecf78efda36d49815f8f8757bd24d4cb] | committer: Martin Storsjö

arm: Remove a redundant check in fmtconvert_init_arm.c

This was missed in e2710e790c0, where have_vfp && !have_vfpv3 were
converted into have_vfp_vm.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b487add7ecf78efda36d49815f8f8757bd24d4cb
---

 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)) {