[SCM] libav/experimental: PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:48:15 UTC 2013
The following commit has been merged in the experimental branch:
commit e912c13ad7f6cc4e433dbbb65bea60cd20de5b1e
Author: Diego Biurrun <diego at biurrun.de>
Date: Thu Jun 25 10:14:05 2009 +0000
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
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 5030a6b..33f4779 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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list