From e912c13ad7f6cc4e433dbbb65bea60cd20de5b1e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 25 Jun 2009 10:14:05 +0000 Subject: [PATCH] PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set. Originally committed as revision 29388 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 5030a6b623..33f47795ef 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1301,13 +1301,12 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uin //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