diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:22:23 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:22:47 +0300 |
| commit | b66b1a103fff88682fab7960e698080f6b847098 (patch) | |
| tree | 4b4058741259059d47467dce4b2c59f856635483 /libavresample/x86/audio_mix_init.c | |
| parent | c16e99e3b3c02edcf33245468731d414eab97dac (diff) | |
| parent | d68c05380cebf563915412182643a8be04ef890b (diff) | |
Merge commit 'd68c05380cebf563915412182643a8be04ef890b'
* commit 'd68c05380cebf563915412182643a8be04ef890b':
x86: check for AV_CPU_FLAG_AVXSLOW where useful
See: c16e99e3b3c02edcf33245468731d414eab97dac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/audio_mix_init.c')
| -rw-r--r-- | libavresample/x86/audio_mix_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavresample/x86/audio_mix_init.c b/libavresample/x86/audio_mix_init.c index 2f05eee81a..9b86be2847 100644 --- a/libavresample/x86/audio_mix_init.c +++ b/libavresample/x86/audio_mix_init.c @@ -195,11 +195,13 @@ av_cold void ff_audio_mix_init_x86(AudioMix *am) ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT, 1, 2, 16, 8, "SSE4", ff_mix_1_to_2_s16p_flt_sse4); } - if (EXTERNAL_AVX(cpu_flags)) { + if (EXTERNAL_AVX_FAST(cpu_flags)) { ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT, 2, 1, 32, 16, "AVX", ff_mix_2_to_1_fltp_flt_avx); ff_audio_mix_set_func(am, AV_SAMPLE_FMT_FLTP, AV_MIX_COEFF_TYPE_FLT, 1, 2, 32, 8, "AVX", ff_mix_1_to_2_fltp_flt_avx); + } + if (EXTERNAL_AVX(cpu_flags)) { ff_audio_mix_set_func(am, AV_SAMPLE_FMT_S16P, AV_MIX_COEFF_TYPE_FLT, 1, 2, 16, 8, "AVX", ff_mix_1_to_2_s16p_flt_avx); } |