This was missed in e2710e790c0, where have_vfp && !have_vfpv3 were converted into have_vfp_vm.
Unified · Split
| @@ -42,10 +42,8 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx · 41 unmodified lines | |||
| 42 | int cpu_flags = av_get_cpu_flags(); | 42 | int cpu_flags = av_get_cpu_flags(); |
| 43 | 43 | ||
| 44 | if (have_vfp_vm(cpu_flags)) { | 44 | if (have_vfp_vm(cpu_flags)) { |
| 45 | if (!have_vfpv3(cpu_flags)) { | 45 | c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp; |
| 46 | c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp; | 46 | c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp; |
| 47 | c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp; | ||
| 48 | } | ||
| 49 | } | 47 | } |
| 50 | 48 | ||
| 51 | if (have_neon(cpu_flags)) { | 49 | if (have_neon(cpu_flags)) { |