mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'
* commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb': arm: Remove a redundant check in fmtconvert_init_arm.c Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
68e479e3ad
|
@ -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_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_array8 = ff_int32_to_float_fmul_array8_vfp;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (have_neon(cpu_flags)) {
|
if (have_neon(cpu_flags)) {
|
||||||
|
|
Loading…
Reference in New Issue