Revert "Compile FFmpeg on PowerPC-based machines without AltiVec support until it...

This reverts commit bc9eac0a14cfa196d4e8514049f744740cb7a23d.

This should fix the ppc lag we had.

Conflicts:

	extras/contrib/src/Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index cff988bfd1212eb8e5d88657aab9cce6cd2cdc94..7f3aad86794e95db9c6ffbb6398a229fc59b6ca9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -151,8 +151,6 @@ ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
-else
-FFMPEGCONF += --disable-altivec
 endif
 endif
 
@@ -1083,9 +1081,6 @@ endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
-ifdef HAVE_DARWIN_OS
-       (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
-endif
 ifdef NO_TEXT_RELOCATION
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
 endif

diff --git a/extras/contrib/src/Patches/ffmpeg-fix-noaltivec.patch b/extras/contrib/src/Patches/ffmpeg-fix-noaltivec.patch
deleted file mode 100644 (file)
index 8f79780..0000000
--- a/extras/contrib/src/Patches/ffmpeg-fix-noaltivec.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: swscale.c
-===================================================================
---- swscale.c  (revision 26515)
-+++ swscale.c  (working copy)
-@@ -880,7 +880,7 @@
- #endif
- 
- #ifdef ARCH_POWERPC
--#if (defined (HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL)
-+#if (defined (HAVE_ALTIVEC)) && defined (CONFIG_GPL)
- #define COMPILE_ALTIVEC
- #endif //HAVE_ALTIVEC
- #endif //ARCH_POWERPC
-@@ -1553,11 +1553,13 @@
- 
- #else
- #ifdef ARCH_POWERPC
-+#ifdef COMPILE_ALTIVEC
-     if (flags & SWS_CPU_CAPS_ALTIVEC)
-         return swScale_altivec;
-     else
-         return swScale_C;
- #endif
-+#endif
-     return swScale_C;
- #endif /* defined(ARCH_X86) */
- #else //RUNTIME_CPUDETECT