diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 14:28:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 14:28:42 +0200 |
| commit | f903b4266381c5e2f2ba0b6e83a00a1a0b38b163 (patch) | |
| tree | a4eaae3e4f42e81d3fefdb1431170d29f1e9ccef /libavcodec/x86/fft_init.c | |
| parent | 7af7b45c3802d3d75981057cfda1e1764e96c4da (diff) | |
| parent | e7b31844f68eb51137740c5eec29b35eb4994004 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Split DCT and FFT initialization into separate files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fft_init.c')
| -rw-r--r-- | libavcodec/x86/fft_init.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libavcodec/x86/fft_init.c b/libavcodec/x86/fft_init.c index c935c6c75c..5682230c8e 100644 --- a/libavcodec/x86/fft_init.c +++ b/libavcodec/x86/fft_init.c @@ -16,9 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dct.h" #include "fft.h" av_cold void ff_fft_init_x86(FFTContext *s) @@ -54,17 +55,3 @@ av_cold void ff_fft_init_x86(FFTContext *s) s->fft_permutation = FF_FFT_PERM_AVX; } } - -#if CONFIG_DCT -av_cold void ff_dct_init_x86(DCTContext *s) -{ - int cpu_flags = av_get_cpu_flags(); - - if (EXTERNAL_SSE(cpu_flags)) - s->dct32 = ff_dct32_float_sse; - if (EXTERNAL_SSE2(cpu_flags)) - s->dct32 = ff_dct32_float_sse2; - if (EXTERNAL_AVX(cpu_flags)) - s->dct32 = ff_dct32_float_avx; -} -#endif |