[MPlayer-cvslog] r19374 - trunk/libswscale/swscale.c

[uau]

Author: uau
Date: Sat Aug 12 19:46:40 2006
New Revision: 19374

Modified:
   trunk/libswscale/swscale.c

Log:
Use COMPILE_MMX2 instead of HAVE_MMX2 to determine whether to compile
MMX2 code, because the HAVE_ defines do not have sane values here if
runtime cpudetection is used. Hopefully fixes runtime cpudetection
breakage from r19339.


Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	(original)
+++ trunk/libswscale/swscale.c	Sat Aug 12 19:46:40 2006
@@ -1241,7 +1241,7 @@
         return 0;
 }
 
-#ifdef HAVE_MMX2
+#ifdef COMPILE_MMX2
 static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *filter, int32_t *filterPos, int numSplits)
 {
 	uint8_t *fragmentA;
@@ -1412,7 +1412,7 @@
 	}
 	filterPos[i/2]= xpos>>16; // needed to jump to the next part
 }
-#endif /* HAVE_MMX2 */
+#endif /* COMPILE_MMX2 */
 
 static void globalInit(void){
     // generating tables:
@@ -2116,7 +2116,7 @@
 				 srcFilter->chrH, dstFilter->chrH, c->param);
 
 #define MAX_FUNNY_CODE_SIZE 10000
-#if defined(HAVE_MMX2)
+#if defined(COMPILE_MMX2)
 // can't downscale !!!
 		if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
 		{
@@ -2136,7 +2136,7 @@
 			initMMX2HScaler(      dstW, c->lumXInc, c->funnyYCode , c->lumMmx2Filter, c->lumMmx2FilterPos, 8);
 			initMMX2HScaler(c->chrDstW, c->chrXInc, c->funnyUVCode, c->chrMmx2Filter, c->chrMmx2FilterPos, 4);
 		}
-#endif /* defined(HAVE_MMX2) */
+#endif /* defined(COMPILE_MMX2) */
 	} // Init Horizontal stuff