[SCM] libav/experimental: Use mode=receive instead of mode=play if in RTSP muxer (instead of demuxer) mode.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:38 UTC 2013


The following commit has been merged in the experimental branch:
commit 69adcc4ffb748d732acc8462890e50969d7e770c
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Feb 19 23:11:59 2010 +0000

    Use mode=receive instead of mode=play if in RTSP muxer (instead of demuxer)
    mode.
    
    Patch by Martin Storsjö <$firstname $firstname st>.
    
    Originally committed as revision 21912 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 35c965c..d16a9bd 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1109,7 +1109,9 @@ static int make_setup_request(AVFormatContext *s, const char *host, int port,
             snprintf(transport, sizeof(transport) - 1,
                      "%s/UDP;multicast", trans_pref);
         }
-        if (rt->server_type == RTSP_SERVER_REAL ||
+        if (s->oformat) {
+            av_strlcat(transport, ";mode=receive", sizeof(transport));
+        } else if (rt->server_type == RTSP_SERVER_REAL ||
             rt->server_type == RTSP_SERVER_WMS)
             av_strlcat(transport, ";mode=play", sizeof(transport));
         snprintf(cmd, sizeof(cmd),

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list