[vlc-devel] commit: contribs: remove no longer needed swscale patch ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Apr 13 18:53:20 2009 +0200| [b181de412b91984d7013903fc1eb1084be489ad7] | committer: Felix Paul Kühne 

contribs: remove no longer needed swscale patch

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b181de412b91984d7013903fc1eb1084be489ad7
---

 extras/contrib/src/Makefile                        |    2 -
 .../contrib/src/Patches/ffmpeg-swscale-ppc.patch   |   24 --------------------
 2 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2928333..a5c38cb 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1089,8 +1089,6 @@ ifdef HAVE_BEOS
 endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
-else
-	(cd $@; patch -p0 < ../Patches/ffmpeg-swscale-ppc.patch)
 endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
diff --git a/extras/contrib/src/Patches/ffmpeg-swscale-ppc.patch b/extras/contrib/src/Patches/ffmpeg-swscale-ppc.patch
deleted file mode 100644
index 64ccb07..0000000
--- a/extras/contrib/src/Patches/ffmpeg-swscale-ppc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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;