[SCM] libav/experimental: use FF_NETERROR to make winsock happy, patch from prossATxvidDoTorg

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:18:12 UTC 2013


The following commit has been merged in the experimental branch:
commit 5ee0e1395d6e71eebe31768dd4663247dc0c183d
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Thu Apr 3 22:15:16 2008 +0000

    use FF_NETERROR to make winsock happy, patch from prossATxvidDoTorg
    
    Originally committed as revision 12678 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 1431bc0..c2c6c7d 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1094,7 +1094,7 @@ static int rtsp_read_header(AVFormatContext *s,
             goto fail;
         protocol_mask &= ~(1 << protocol);
         if (protocol_mask == 0 && err == 1) {
-            err = AVERROR(EPROTONOSUPPORT);
+            err = AVERROR(FF_NETERROR(EPROTONOSUPPORT));
             goto fail;
         }
     } while (err);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list