[FFmpeg-cvslog] r22436 - branches/0.5/libswscale/swscale.c

[siretart]

Author: siretart
Date: Wed Mar 10 21:55:07 2010
New Revision: 22436

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.

backport r30869 from mplayer repo by siretart

Modified:
   branches/0.5/libswscale/swscale.c

Modified: branches/0.5/libswscale/swscale.c
==============================================================================
--- branches/0.5/libswscale/swscale.c	Wed Mar 10 17:11:02 2010	(r22435)
+++ branches/0.5/libswscale/swscale.c	Wed Mar 10 21:55:07 2010	(r22436)
@@ -960,7 +960,7 @@ static inline void yuv2rgbXinC_full(SwsC
 #endif
 
 #if ARCH_PPC
-#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT
+#if HAVE_ALTIVEC
 #define COMPILE_ALTIVEC
 #endif
 #endif //ARCH_PPC
@@ -1649,7 +1649,7 @@ static SwsFunc getSwsFunc(int flags){
         return swScale_C;
 
 #else
-#if ARCH_PPC
+#if ARCH_PPC && COMPILE_ALTIVEC
     if (flags & SWS_CPU_CAPS_ALTIVEC)
         return swScale_altivec;
     else