Browse Source

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>
tags/n4.0
Martin Storsjö 8 years ago
parent
commit
b487add7ec
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      libavcodec/arm/fmtconvert_init_arm.c

+ 2
- 4
libavcodec/arm/fmtconvert_init_arm.c View File

@@ -42,10 +42,8 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();


if (have_vfp_vm(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)) { if (have_neon(cpu_flags)) {


Loading…
Cancel
Save