Mercurial > mplayer.hg

changeset 29346:6f1e9ed64b78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set.
author diego
date Thu, 25 Jun 2009 10:14:05 +0000
parents 1f8d78a38803
children e07f2855672a
files libswscale/swscale.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Wed Jun 24 23:31:17 2009 +0000
+++ b/libswscale/swscale.c	Thu Jun 25 10:14:05 2009 +0000
@@ -1301,13 +1301,12 @@
 
 //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