[patch] patch 2/2: make inclusion of mmx/sse related assembly routines dependand on config

mplayer-hardened-1.0_rc2_p20090322.patch (text/plain), 2.10 KB, created by Hugo Mildenberger on 2009-04-13 05:40:09 UTC

diff -r -u a/liba52/imdct.c b/liba52/imdct.c
--- a/liba52/imdct.c	2009-02-26 18:27:17.000000000 +0100
+++ b/liba52/imdct.c	2009-04-13 04:35:20.000000000 +0200
@@ -712,6 +712,7 @@
 // Stuff below this line is borrowed from libac3
 #include "srfftp.h"
 #if ARCH_X86 || ARCH_X86_64
+#if HAVE_SSE
 #undef HAVE_AMD3DNOW
 #define HAVE_AMD3DNOW 1
 #include "srfftp_3dnow.h"
@@ -726,7 +727,6 @@
 #undef HAVE_AMD3DNOWEXT
 #define HAVE_AMD3DNOWEXT 1
 #include "imdct_3dnow.h"
-
 void
 imdct_do_512_sse(sample_t data[],sample_t delay[], sample_t bias)
 {
@@ -1060,6 +1060,7 @@
 		: "%"REG_S, "%"REG_D
 	);
 }
+#endif // HAVE_SSE
 #endif // ARCH_X86 || ARCH_X86_64
 
 void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias)
@@ -1259,24 +1260,30 @@
 	ifft64 = ifft64_c;
 
 #if ARCH_X86 || ARCH_X86_64
+#if HAVE_SSE
 	if(mm_accel & MM_ACCEL_X86_SSE)
 	{
 	  fprintf (stderr, "Using SSE optimized IMDCT transform\n");
 	  a52_imdct_512 = imdct_do_512_sse;
 	}
 	else
+#endif // HAVE_SSE
+#if HAVE_3DNOWEXT
 	if(mm_accel & MM_ACCEL_X86_3DNOWEXT)
 	{
 	  fprintf (stderr, "Using 3DNowEx optimized IMDCT transform\n");
 	  a52_imdct_512 = imdct_do_512_3dnowex;
 	}
 	else
+#endif // HAVE_3DNOWEXT
+#if HAVE_3DNOW
 	if(mm_accel & MM_ACCEL_X86_3DNOW)
 	{
 	  fprintf (stderr, "Using 3DNow optimized IMDCT transform\n");
 	  a52_imdct_512 = imdct_do_512_3dnow;
 	}
 	else
+#endif // HAVE_3DNOW
 #endif // ARCH_X86 || ARCH_X86_64
 #if HAVE_ALTIVEC
         if (mm_accel & MM_ACCEL_PPC_ALTIVEC)
diff -r -u a/liba52/resample.c b/liba52/resample.c
--- a/liba52/resample.c	2009-02-26 18:27:17.000000000 +0100
+++ b/liba52/resample.c	2009-04-13 03:38:16.000000000 +0200
@@ -39,8 +39,10 @@
 #include "resample_c.c"
 
 #if ARCH_X86 || ARCH_X86_64
+#if HAVE_MMX
 #include "resample_mmx.c"
 #endif
+#endif
 
 #if HAVE_ALTIVEC
 #include "resample_altivec.c"
@@ -50,6 +52,7 @@
 void* tmp;
 
 #if ARCH_X86 || ARCH_X86_64
+#if HAVE_MMX
     if(mm_accel&MM_ACCEL_X86_MMX){
 	tmp=a52_resample_MMX(flags,chans);
 	if(tmp){
@@ -59,6 +62,7 @@
 	}
     }
 #endif
+#endif
 #if HAVE_ALTIVEC
     if(mm_accel&MM_ACCEL_PPC_ALTIVEC){
       tmp=a52_resample_altivec(flags,chans);