[vlc-devel] commit: contribs/ffmpeg: apply ppc-only patches on ppc only... ( Felix Paul Kühne )

git version control git at videolan.org
Sun Apr 12 14:20:16 CEST 2009


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Apr 12 14:19:19 2009 +0200| [306aa7be1ecf6a6aa922771881e85d796d54f723] | committer: Felix Paul Kühne 

contribs/ffmpeg: apply ppc-only patches on ppc only...

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

 extras/contrib/src/Makefile                        |    5 ++---
 ...mpeg-swscale.patch => ffmpeg-swscale-ppc.patch} |    0 
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e21cf04..0af68a0 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1089,9 +1089,8 @@ ifdef HAVE_BEOS
 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)
+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.patch b/extras/contrib/src/Patches/ffmpeg-swscale-ppc.patch
similarity index 100%
rename from extras/contrib/src/Patches/ffmpeg-swscale.patch
rename to extras/contrib/src/Patches/ffmpeg-swscale-ppc.patch




More information about the vlc-devel mailing list