summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsiretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-09 08:07:34 +0000
committersiretart <siretart@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-09 08:07:34 +0000
commit26dbd2fc7c402141cdff72c3e064233dd78253d4 (patch)
treec5d609ef513d512d46e8e190ee7d66b6c3f9ea40
parent39e9706f63b8798af6961053f2ac08620bc20ecf (diff)
downloadmpv-26dbd2fc7c402141cdff72c3e064233dd78253d4.tar.bz2
mpv-26dbd2fc7c402141cdff72c3e064233dd78253d4.tar.xz
Fix compilation on powerpc with --disable-altivec
in case altivec is disabled, even compilation of code using altivec keywords or asm must be avoided. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30869 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale.c4
1 files 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;