From 07cea6d1cd4e2db922c3e331e86801db3871e08d Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Tue, 9 Mar 2010 08:07:34 +0000 Subject: [PATCH] Fix compilation on powerpc with --disable-altivec in case altivec is disabled, even compilation of code using altivec keywords or asm must be avoided. Originally committed as revision 30869 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 0b1faa1f4b..3c278d571b 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1142,7 +1142,7 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uin #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;