Commit fa79d12d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

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

This reverts commit bc9eac0a.

This should fix the ppc lag we had.

Conflicts:

	extras/contrib/src/Makefile
parent 4b23018d
...@@ -151,8 +151,6 @@ ifdef HAVE_DARWIN_OS ...@@ -151,8 +151,6 @@ ifdef HAVE_DARWIN_OS
X264CONF += --enable-pic X264CONF += --enable-pic
ifdef HAVE_DARWIN_OS_ON_INTEL ifdef HAVE_DARWIN_OS_ON_INTEL
FFMPEG_CFLAGS += -DHAVE_LRINTF FFMPEG_CFLAGS += -DHAVE_LRINTF
else
FFMPEGCONF += --disable-altivec
endif endif
endif endif
...@@ -1083,9 +1081,6 @@ endif ...@@ -1083,9 +1081,6 @@ endif
ifdef HAVE_DARWIN_OS_ON_INTEL ifdef HAVE_DARWIN_OS_ON_INTEL
(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
endif endif
ifdef HAVE_DARWIN_OS
(cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
endif
ifdef NO_TEXT_RELOCATION ifdef NO_TEXT_RELOCATION
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
endif endif
......
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment