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

[siretart]

Author: siretart
Date: Tue Mar  9 09:07:34 2010
New Revision: 30869

Log:
Fix compilation on powerpc with --disable-altivec

in case altivec is disabled, even compilation of code using altivec
keywords or asm must be avoided.

Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Tue Mar  9 07:27:54 2010	(r30868)
+++ trunk/libswscale/swscale.c	Tue Mar  9 09:07:34 2010	(r30869)
@@ -1142,7 +1142,7 @@ static inline void monoblack2Y(uint8_t *
 #endif
 
 #if ARCH_PPC
-#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT
+#if HAVE_ALTIVEC
 #define COMPILE_ALTIVEC
 #endif
 #endif //ARCH_PPC
@@ -1245,7 +1245,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
     }
 
 #else
-#if ARCH_PPC
+#if ARCH_PPC && COMPILE_ALTIVEC
     if (flags & SWS_CPU_CAPS_ALTIVEC) {
         sws_init_swScale_altivec(c);
         return swScale_altivec;