[FFmpeg-cvslog] r29388 - trunk/libswscale/swscale.c

[diego]

Author: diego
Date: Thu Jun 25 12:14:05 2009
New Revision: 29388

Log:
PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set.

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Thu Jun 25 01:31:17 2009	(r29387)
+++ trunk/libswscale/swscale.c	Thu Jun 25 12:14:05 2009	(r29388)
@@ -1301,13 +1301,12 @@ static inline void monoblack2Y(uint8_t *
 
 //Note: we have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one
 //Plain C versions
-#if !HAVE_MMX || CONFIG_RUNTIME_CPUDETECT || !CONFIG_GPL
+#if (!HAVE_MMX && !HAVE_ALTIVEC) || CONFIG_RUNTIME_CPUDETECT || !CONFIG_GPL
 #define COMPILE_C
 #endif
 
 #if ARCH_PPC
 #if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
-#undef COMPILE_C
 #define COMPILE_ALTIVEC
 #endif
 #endif //ARCH_PPC