Only enable SSE/3DNOW optimizations when they have been enabled at compilation.

Fixes shared build with SSE/3DNOW disabled but MMX and yasm enabled.

Originally committed as revision 17451 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/fft.c b/libavcodec/fft.c
index 0760567f7221bcd29a51b2ba10402824b126ecf4..296f634663366301f5cefd2392d00b17e9c873fb 100644 (file)
--- a/libavcodec/fft.c
+++ b/libavcodec/fft.c
@@ -89,18 +89,18 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
 
 #if HAVE_MMX && HAVE_YASM
     has_vectors = mm_support();
-    if (has_vectors & FF_MM_SSE) {
+    if (has_vectors & FF_MM_SSE && HAVE_SSE) {
         /* SSE for P3/P4/K8 */
         s->imdct_calc  = ff_imdct_calc_sse;
         s->imdct_half  = ff_imdct_half_sse;
         s->fft_permute = ff_fft_permute_sse;
         s->fft_calc    = ff_fft_calc_sse;
-    } else if (has_vectors & FF_MM_3DNOWEXT) {
+    } else if (has_vectors & FF_MM_3DNOWEXT && HAVE_AMD3DNOWEXT) {
         /* 3DNowEx for K7 */
         s->imdct_calc = ff_imdct_calc_3dn2;
         s->imdct_half = ff_imdct_half_3dn2;
         s->fft_calc   = ff_fft_calc_3dn2;
-    } else if (has_vectors & FF_MM_3DNOW) {
+    } else if (has_vectors & FF_MM_3DNOW && HAVE_AMD3DNOW) {
         /* 3DNow! for K6-2/3 */
         s->imdct_calc = ff_imdct_calc_3dn;
         s->imdct_half = ff_imdct_half_3dn;