diff options
| author | Martin Storsjö <martin@martin.st> | 2017-10-23 10:44:53 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2017-10-24 09:07:01 +0300 |
| commit | b487add7ecf78efda36d49815f8f8757bd24d4cb (patch) | |
| tree | 2831f3e4c859165c8f6bc287fafc412a296eb0ee | |
| parent | 17f5171cd4753e7f50e6d95df069bccbc90265bf (diff) | |
| download | ffmpeg-b487add7ecf78efda36d49815f8f8757bd24d4cb.tar.gz | |
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@martin.st>
| -rw-r--r-- | libavcodec/arm/fmtconvert_init_arm.c | 6 |
1 files 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)) { |