From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sun, 12 Apr 2009 12:19:19 +0000 (+0200)
Subject: contribs/ffmpeg: apply ppc-only patches on ppc only...
X-Git-Tag: 1.0.0-pre2~94
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=306aa7be1ecf6a6aa922771881e85d796d54f723;p=vlc

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e21cf045f1..0af68a0f76 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