[vlc-devel] commit: FFmpeg fixed its rtsp mingw compatibility. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Apr  3 15:33:33 2008 -0700| [af7f84c8352c176a3e95eca91b5d62eaa0c71632]

FFmpeg fixed its rtsp mingw compatibility.

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

 extras/contrib/src/Makefile                       |    3 ---
 extras/contrib/src/Patches/ffmpeg-svn-win32.patch |   11 -----------
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 36c3905..abf9593 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1051,9 +1051,6 @@ endif
 ifdef HAVE_DARWIN_OS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
-ifdef HAVE_WIN32
-	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
-endif
 ifdef NO_TEXT_RELOCATION
 	(cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
deleted file mode 100644
index 2238a01..0000000
--- a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavformat/rtsp_old.c	2008-03-28 21:47:00.614740700 -0400
-+++ libavformat/rtsp.c	2008-03-29 06:35:39.143600000 -0400
-@@ -1094,7 +1094,7 @@
-             goto fail;
-         protocol_mask &= ~(1 << protocol);
-         if (protocol_mask == 0 && err == 1) {
--            err = AVERROR(EPROTONOSUPPORT);
-+            err = AVERROR(AVERROR_NOTSUPP);
-             goto fail;
-         }
-     } while (err);