Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / x86 / fft.c

diff --git a/libavcodec/x86/fft.c b/libavcodec/x86/fft.c
index 13f7ea6ec2f0cd518c98d88dccc974857e71502e..18964d88ca6bb9b263c4a8da1982607f8ec5b3f4 100644 (file)
--- a/libavcodec/x86/fft.c
+++ b/libavcodec/x86/fft.c
@@ -56,9 +56,13 @@ av_cold void ff_fft_init_mmx(FFTContext *s)
 #if CONFIG_DCT
 av_cold void ff_dct_init_mmx(DCTContext *s)
 {
+#if HAVE_YASM
     int has_vectors = av_get_cpu_flags();
-    if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE)
+    if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX)
+        s->dct32 = ff_dct32_float_avx;
+    else if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE)
         s->dct32 = ff_dct32_float_sse;
+#endif
 }
 #endif