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

contribs: remove no longer needed swscale patch

parent bd0ccf4c
...@@ -1089,8 +1089,6 @@ ifdef HAVE_BEOS ...@@ -1089,8 +1089,6 @@ ifdef HAVE_BEOS
endif 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)
else
(cd $@; patch -p0 < ../Patches/ffmpeg-swscale-ppc.patch)
endif endif
ifdef HAVE_UCLIBC ifdef HAVE_UCLIBC
patch -p0 < Patches/ffmpeg-svn-uclibc.patch patch -p0 < Patches/ffmpeg-svn-uclibc.patch
......
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