1E10l

#undef ARCH_X86
...
#ifdef ARCH_X86
...
#define ARCH_X86
...
#endif


git-svn-id: file:///var/local/repositories/mplayer/trunk/postproc@11072 b3059339-0415-0410-9bf9-f77b7e298cf2

rgb2rgb.c

@@ -148,7 +148,6 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
 #undef HAVE_MMX
 #undef HAVE_MMX2
 #undef HAVE_3DNOW
-#undef ARCH_X86
 #undef HAVE_SSE2
 #define RENAME(a) a ## _C
 #include "rgb2rgb_template.c"
@@ -161,7 +160,6 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
 #undef HAVE_MMX2
 #undef HAVE_3DNOW
 #undef HAVE_SSE2
-#define ARCH_X86
 #define RENAME(a) a ## _MMX
 #include "rgb2rgb_template.c"
 
@@ -171,7 +169,6 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
 #define HAVE_MMX2
 #undef HAVE_3DNOW
 #undef HAVE_SSE2
-#define ARCH_X86
 #define RENAME(a) a ## _MMX2
 #include "rgb2rgb_template.c"
 
@@ -181,8 +178,7 @@ static uint64_t __attribute__((aligned(8))) dither8[2]={
 #undef HAVE_MMX2
 #define HAVE_3DNOW
 #undef HAVE_SSE2
-#define ARCH_X86
-#define RENAME(a) a ## _3DNow
+#define RENAME(a) a ## _3DNOW
 #include "rgb2rgb_template.c"
 
 #endif //ARCH_X86
@@ -219,8 +215,8 @@ void sws_rgb2rgb_init(int flags){
 		yv12touyvy= yv12touyvy_MMX2;
 		yuv422ptoyuy2= yuv422ptoyuy2_MMX2;
 		yuy2toyv12= yuy2toyv12_MMX2;
-		uyvytoyv12= uyvytoyv12_MMX2;
-		yvu9toyv12= yvu9toyv12_MMX2;
+//		uyvytoyv12= uyvytoyv12_MMX2;
+//		yvu9toyv12= yvu9toyv12_MMX2;
 		planar2x= planar2x_MMX2;
 		rgb24toyv12= rgb24toyv12_MMX2;
 		interleaveBytes= interleaveBytes_MMX2;
@@ -249,8 +245,8 @@ void sws_rgb2rgb_init(int flags){
 		yv12touyvy= yv12touyvy_3DNOW;
 		yuv422ptoyuy2= yuv422ptoyuy2_3DNOW;
 		yuy2toyv12= yuy2toyv12_3DNOW;
-		uyvytoyv12= uyvytoyv12_3DNOW;
-		yvu9toyv12= yvu9toyv12_3DNOW;
+//		uyvytoyv12= uyvytoyv12_3DNOW;
+//		yvu9toyv12= yvu9toyv12_3DNOW;
 		planar2x= planar2x_3DNOW;
 		rgb24toyv12= rgb24toyv12_3DNOW;
 		interleaveBytes= interleaveBytes_3DNOW;
@@ -279,8 +275,8 @@ void sws_rgb2rgb_init(int flags){
 		yv12touyvy= yv12touyvy_MMX;
 		yuv422ptoyuy2= yuv422ptoyuy2_MMX;
 		yuy2toyv12= yuy2toyv12_MMX;
-		uyvytoyv12= uyvytoyv12_MMX;
-		yvu9toyv12= yvu9toyv12_MMX;
+//		uyvytoyv12= uyvytoyv12_MMX;
+//		yvu9toyv12= yvu9toyv12_MMX;
 		planar2x= planar2x_MMX;
 		rgb24toyv12= rgb24toyv12_MMX;
 		interleaveBytes= interleaveBytes_MMX;