diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-06-25 10:14:05 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-06-25 10:14:05 +0000 |
commit | 052fee1295d788eafd7b9a49ae7cf3c989668a18 (patch) | |
tree | afb37f1aa7ce9d4e4f55e22f884de0e5aa3e6493 /libswscale | |
parent | 63b0136feadd711bbaf2cd8f884cce7bc1986a2b (diff) | |
download | mpv-052fee1295d788eafd7b9a49ae7cf3c989668a18.tar.bz2 mpv-052fee1295d788eafd7b9a49ae7cf3c989668a18.tar.xz |
PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29388 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/swscale.c | 3 |
1 files changed, 1 insertions, 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 |