ffmpeg-cvs.patch: fix upstream

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b32df86db6156f77067aa98995c8e522a6b520bf..76e1d3f550db60744b5da304d17afaf5807cdd9a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -856,7 +856,6 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
        echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
        CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
-       (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch)
 endif

diff --git a/extras/contrib/src/Patches/ffmpeg-cvs.patch b/extras/contrib/src/Patches/ffmpeg-cvs.patch
deleted file mode 100644 (file)
index a729ccb..0000000
--- a/extras/contrib/src/Patches/ffmpeg-cvs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
-retrieving revision 1.99
-diff -u -r1.99 Makefile
---- Makefile   13 Feb 2006 14:28:32 -0000      1.99
-+++ Makefile   14 Feb 2006 13:39:47 -0000
-@@ -151,6 +151,7 @@
- 
- install-headers:
-       install -d "$(incdir)"
-+      install -d "$(prefix)/include/postproc"
-       install -d "$(libdir)/pkgconfig"
-       $(MAKE) -C libavutil   install-headers
-       $(MAKE) -C libavcodec  install-headers