[vlc-devel] commit: Trying to use non-existant patches isn' t exactly the idea of the century. ( Felix Paul Kühne )

git version control git at videolan.org
Thu Jun 12 03:14:55 CEST 2008


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jun 12 03:16:40 2008 +0200| [2b31f402c55300bcc09692499ed1e9c7cfe3d539]

Trying to use non-existant patches isn't exactly the idea of the century.

Please leave the FFmpeg revision fixed and only update it if you sure that your newer one is stable, nice and cool.

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

 extras/contrib/src/Makefile |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b83568c..fa38277 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1068,7 +1068,6 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ifdef SVN
 ffmpeg:
 	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 12920
-	(cd $@; patch -p0 < ../Patches/ffmpeg-pkg-config.patch)
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1090,7 +1089,6 @@ ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
 	patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
-	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-configure.patch )
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
 	echo "ffmpeg snapshot is too old, you MUST use subversion !"




More information about the vlc-devel mailing list