diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-03-10 20:55:07 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-03-10 20:55:07 +0000 |
| commit | 557e065d5fb738551057348e4c7eb0feba81a3f8 (patch) | |
| tree | da2f1a005d0f73877db51f7b751b8af8f57edb18 | |
| parent | 461243731d0ab7532fb4979414cb26afabc03f5e (diff) | |
| download | ffmpeg-557e065d5fb738551057348e4c7eb0feba81a3f8.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.
backport r30869 from mplayer repo by siretart
Originally committed as revision 22436 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
| -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 0c089c810a..0bdebc59e7 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -960,7 +960,7 @@ static inline void yuv2rgbXinC_full(SwsContext *c, int16_t *lumFilter, int16_t * #endif #if ARCH_PPC -#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT +#if HAVE_ALTIVEC #define COMPILE_ALTIVEC #endif #endif //ARCH_PPC @@ -1649,7 +1649,7 @@ static SwsFunc getSwsFunc(int flags){ return swScale_C; #else -#if ARCH_PPC +#if ARCH_PPC && COMPILE_ALTIVEC if (flags & SWS_CPU_CAPS_ALTIVEC) return swScale_altivec; else |