diff options
author | James Almer <jamrial@gmail.com> | 2015-05-31 14:20:29 -0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 00:15:35 +0200 |
commit | c16e99e3b3c02edcf33245468731d414eab97dac (patch) | |
tree | c5435ea3aadf24030fa9c064c76cc535956fb136 /libswresample/x86/resample_init.c | |
parent | 16c430e8efc8d8528df7805429175dfdfd0d87ac (diff) |
x86: check for AV_CPU_FLAG_AVXSLOW where useful
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/resample_init.c')
-rw-r--r-- | libswresample/x86/resample_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/x86/resample_init.c b/libswresample/x86/resample_init.c index 93001d65cb..bc444cfb8b 100644 --- a/libswresample/x86/resample_init.c +++ b/libswresample/x86/resample_init.c @@ -67,11 +67,11 @@ av_cold void swri_resample_dsp_x86_init(ResampleContext *c) c->dsp.resample = c->linear ? ff_resample_linear_float_sse : ff_resample_common_float_sse; } - if (EXTERNAL_AVX(mm_flags)) { + if (EXTERNAL_AVX_FAST(mm_flags)) { c->dsp.resample = c->linear ? ff_resample_linear_float_avx : ff_resample_common_float_avx; } - if (EXTERNAL_FMA3(mm_flags)) { + if (EXTERNAL_FMA3(mm_flags) && !(mm_flags & AV_CPU_FLAG_AVXSLOW)) { c->dsp.resample = c->linear ? ff_resample_linear_float_fma3 : ff_resample_common_float_fma3; } |