# HG changeset patch
# User rfelker
# Date 1153287758 0
# Node ID f569aadfa92180354fba27ae4cad294cb4afbd36
# Parent  0945c6e242c6facad7b33a96d01b0bd5f18381f2
10l, i missed ifdefs around the calls

diff -r 0945c6e242c6 -r f569aadfa921 mp3lib/decod386.c
--- a/mp3lib/decod386.c	Wed Jul 19 05:34:26 2006 +0000
+++ b/mp3lib/decod386.c	Wed Jul 19 05:42:38 2006 +0000
@@ -123,7 +123,7 @@
 
 static synth_func_t synth_func;
 
-#if defined(CAN_COMPILE_X86_ASM)
+#if defined(CAN_COMPILE_X86_ASM) && defined(HAVE_MMX)
 int synth_1to1_MMX( real *bandPtr,int channel,short * samples)
 {
     static short buffs[2][2][0x110];
diff -r 0945c6e242c6 -r f569aadfa921 mp3lib/sr1.c
--- a/mp3lib/sr1.c	Wed Jul 19 05:34:26 2006 +0000
+++ b/mp3lib/sr1.c	Wed Jul 19 05:42:38 2006 +0000
@@ -413,6 +413,7 @@
 
 #ifdef CAN_COMPILE_X86_ASM
 
+#ifdef HAVE_MMX
     if (gCpuCaps.hasMMX)
     {
 	_has_mmx = 1;
@@ -420,7 +421,9 @@
 	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: made decode tables with MMX optimization\n");
 	synth_func = synth_1to1_MMX;
     }
+#endif
 
+#ifdef HAVE_3DNOWEX
     if (gCpuCaps.has3DNowExt)
     {
 	dct36_func=dct36_3dnowex;
@@ -428,6 +431,8 @@
 	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow!Ex optimized decore!\n");
     }
     else
+#endif
+#ifdef HAVE_3DNOW
     if (gCpuCaps.has3DNow)
     {
 	dct36_func = dct36_3dnow;
@@ -435,18 +440,23 @@
 	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow! optimized decore!\n");
     }
     else
+#endif
+#ifdef HAVE_SSE
     if (gCpuCaps.hasSSE)
     {
 	dct64_MMX_func = dct64_sse;
 	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n");
     }
     else
+#endif
+#ifdef HAVE_MMX
     if (gCpuCaps.hasMMX)
     {
 	dct64_MMX_func = dct64_MMX;
 	mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using MMX optimized decore!\n");
     }
     else
+#endif
     if (gCpuCaps.cpuType >= CPUTYPE_I586)
     {
 	synth_func = synth_1to1_pent;