[SCM] libav/experimental: Set proper error if server flags indicate that it doesn't support mmst. This prevents a read-after-close-induced segfault later. Fixes issue 2266.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 42f9582d8da0176130993f02be908bec348ef3e4
Author: qrtt1 <chingyichan.tw at gmail.com>
Date:   Tue Oct 5 14:04:46 2010 +0000

    Set proper error if server flags indicate that it doesn't support mmst. This
    prevents a read-after-close-induced segfault later. Fixes issue 2266.
    
    Patch by qrtt1 <chingyichan dot tw gmail com>.
    
    Originally committed as revision 25349 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mmst.c b/libavformat/mmst.c
index 3d12d82..57cca5d 100644
--- a/libavformat/mmst.c
+++ b/libavformat/mmst.c
@@ -547,8 +547,12 @@ static int mms_open(URLContext *h, const char *uri, int flags)
     err = mms_safe_send_recv(mmst, NULL, SC_PKT_ASF_HEADER);
     if (err)
         goto fail;
-    if((mmst->incoming_flags != 0X08) && (mmst->incoming_flags != 0X0C))
+    if((mmst->incoming_flags != 0X08) && (mmst->incoming_flags != 0X0C)) {
+        av_log(NULL, AV_LOG_ERROR,
+               "The server does not support MMST (try MMSH or RTSP)\n");
+        err = AVERROR_NOFMT;
         goto fail;
+    }
     err = ff_mms_asf_header_parser(mms);
     if (err) {
         dprintf(NULL, "asf header parsed failed!\n");

-- 
Libav/FFmpeg packaging