diff options
| author | James Almer <jamrial@gmail.com> | 2016-02-07 00:52:06 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-02-14 20:04:19 -0300 |
| commit | 4d95207938252d6683411bc2f51f05c3d02749a2 (patch) | |
| tree | 638c97efc0cf56dd4a4c7ef8b313538d6a98d4f4 /libswresample | |
| parent | 1e8a75fae479c75514f1923a4d697dc07f87ca26 (diff) | |
| download | ffmpeg-4d95207938252d6683411bc2f51f05c3d02749a2.tar.gz | |
x86: use the new helper macros where useful
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 70d685a77f283b110e7b1ab565ff5de53f752d55)
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/x86/audio_convert_init.c | 2 | ||||
| -rw-r--r-- | libswresample/x86/resample_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/x86/audio_convert_init.c b/libswresample/x86/audio_convert_init.c index 5e5e91d142..bb89cf604b 100644 --- a/libswresample/x86/audio_convert_init.c +++ b/libswresample/x86/audio_convert_init.c @@ -174,7 +174,7 @@ MULTI_CAPS_FUNC(SSE2, sse2) ac->simd_f = ff_pack_8ch_float_to_int32_a_avx; } } - if(EXTERNAL_AVX2(mm_flags)) { + if(EXTERNAL_AVX2_FAST(mm_flags)) { if( out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_FLT || out_fmt == AV_SAMPLE_FMT_S32P && in_fmt == AV_SAMPLE_FMT_FLTP) ac->simd_f = ff_float_to_int32_a_avx2; } diff --git a/libswresample/x86/resample_init.c b/libswresample/x86/resample_init.c index bc444cfb8b..9d7d5cf89e 100644 --- a/libswresample/x86/resample_init.c +++ b/libswresample/x86/resample_init.c @@ -71,7 +71,7 @@ av_cold void swri_resample_dsp_x86_init(ResampleContext *c) c->dsp.resample = c->linear ? ff_resample_linear_float_avx : ff_resample_common_float_avx; } - if (EXTERNAL_FMA3(mm_flags) && !(mm_flags & AV_CPU_FLAG_AVXSLOW)) { + if (EXTERNAL_FMA3_FAST(mm_flags)) { c->dsp.resample = c->linear ? ff_resample_linear_float_fma3 : ff_resample_common_float_fma3; } |