[vlc-commits] Contribs: remove unnecessary patch

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep 22 16:49:33 2011 +0200| [4998d3773bfa91853dd7597928cbea3f3907da64] | committer: Jean-Baptiste Kempf

Contribs: remove unnecessary patch

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

 extras/contrib/src/Patches/libavformat-ape.c.patch |   17 -----------------
 extras/contrib/src/contrib-src.mak                 |    1 -
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/extras/contrib/src/Patches/libavformat-ape.c.patch b/extras/contrib/src/Patches/libavformat-ape.c.patch
deleted file mode 100644
index ab05cfc..0000000
--- a/extras/contrib/src/Patches/libavformat-ape.c.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Fape.c;h=187c9865a4fce398c7a4b4b19aad0a59b281a469;hp=2de47ef483245372a9a3c56656cd48a30a383856;hb=1c31b26bdf66879a46a7a3e340da815c1b2125a8;hpb=6947b0c42e0649f0c8355442d1732d642e467902
-
-diff --git a/libavformat/ape.c b/libavformat/ape.c
-index 2de47ef..187c986 100644
---- a/libavformat/ape.c
-+++ b/libavformat/ape.c
-@@ -242,6 +242,10 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
-             avio_seek(pb, ape->wavheaderlength, SEEK_CUR);
-     }
- 
-+    if(!ape->totalframes){
-+        av_log(s, AV_LOG_ERROR, "No frames in the file!\n");
-+        return AVERROR(EINVAL);
-+    }
-     if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){
-         av_log(s, AV_LOG_ERROR, "Too many frames: %d\n", ape->totalframes);
-         return -1;
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 8bc056d..d68fc38 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1097,7 +1097,6 @@ endif
 ifdef HAVE_WIN32
 	sed -i "s/std=c99/std=gnu99/" ffmpeg/configure
 endif
-	(cd ffmpeg; patch -p1 < ../Patches/libavformat-ape.c.patch )
 	touch $@
 
 else