Commit d7119bf8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: forward-port Derk-Jan's libswscale fixes (PPC only)

parent 17cbf681
......@@ -1087,6 +1087,9 @@ endif
ifdef HAVE_DARWIN_OS_ON_INTEL
(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
endif
ifdef HAVE_DARWIN_OS
(cd $@; patch -p0 < ../Patches/ffmpeg-swscale.patch)
endif
ifdef HAVE_UCLIBC
patch -p0 < Patches/ffmpeg-svn-uclibc.patch
patch -p0 < Patches/ffmpeg-svn-internal-define.patch
......@@ -2491,7 +2494,7 @@ liboil: liboil-$(OIL_VERSION).tar.gz
.liboil: liboil
ifdef HAVE_DARWIN_OS
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-glib --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O4")
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
else
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
endif
......
diff -ruN libswscale/swscale.c libswscale/swscale.c
--- libswscale/swscale.c 2009-04-03 19:36:49.000000000 +0200
+++ libswscale/swscale.c 2009-04-03 19:40:06.000000000 +0200
@@ -1101,8 +1101,7 @@
#endif
#if ARCH_PPC
-#if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
-#undef COMPILE_C
+#if HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)
#define COMPILE_ALTIVEC
#endif
#endif //ARCH_PPC
@@ -1778,8 +1777,8 @@
static SwsFunc getSwsFunc(int flags){
-#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL
-#if ARCH_X86
+#if defined(RUNTIME_CPUDETECT)
+#if ARCH_X86 && CONFIG_GPL
// ordered per speed fastest first
if (flags & SWS_CPU_CAPS_MMX2)
return swScale_MMX2;
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