FFmpeg fixed its rtsp mingw compatibility.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 36c39059b0b156d8fe456c45deacb1c0c871f3e1..abf959348270afe8b98781b2248894fdc293a4f3 100644 (file)
--- 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 (file)
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);