]> git.sesse.net Git - vlc/commitdiff
Trying to use non-existant patches isn't exactly the idea of the century.
authorFelix Paul Kühne <fkuehne@videolan.org>
Thu, 12 Jun 2008 01:16:40 +0000 (03:16 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Thu, 12 Jun 2008 01:16:40 +0000 (03:16 +0200)
Please leave the FFmpeg revision fixed and only update it if you sure that your newer one is stable, nice and cool.

extras/contrib/src/Makefile

index b83568c10ef8b25b67db842441626bf1c715ecfd..fa3827714a9845cf533601a1717f92b8cb0848bf 100644 (file)
@@ -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 !"