diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-03-09 08:07:34 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-03-09 08:07:34 +0000 |
| commit | 07cea6d1cd4e2db922c3e331e86801db3871e08d (patch) | |
| tree | 413d8c00f62b97419bcf51aa0344f66be3d8da1d | |
| parent | 95bd18eeca4c6f1599d0ca09b37d0e66c82bed8e (diff) | |
| download | ffmpeg-07cea6d1cd4e2db922c3e331e86801db3871e08d.tar.gz | |
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
| -rw-r--r-- | libswscale/swscale.c | 4 |
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; |