diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 23:30:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 23:30:31 -0300 |
| commit | 68e479e3ada8ebdb8f2fdb2f339cc9992757eb85 (patch) | |
| tree | c0187f8d9a9b2128c5b3063c9288ecdc7ec58286 /libavcodec/arm | |
| parent | 507e3f7d26ce7ad75ff146748ae285a8dee3b924 (diff) | |
| parent | b487add7ecf78efda36d49815f8f8757bd24d4cb (diff) | |
| download | ffmpeg-streaming-68e479e3ada8ebdb8f2fdb2f339cc9992757eb85.zip ffmpeg-streaming-68e479e3ada8ebdb8f2fdb2f339cc9992757eb85.tar.gz | |
Merge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'
* commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb':
arm: Remove a redundant check in fmtconvert_init_arm.c
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/arm')
| -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 a734dec..e88255d 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)) { |
