[SCM] libav/experimental: rtsp: Make rtsp_rtp_mux_open reusable

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3d7422302547b02256a4a1ab5552f180455b50a2
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Oct 8 08:51:05 2010 +0000

    rtsp: Make rtsp_rtp_mux_open reusable
    
    Originally committed as revision 25409 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 6ddf149..094ad79 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -502,8 +502,8 @@ void ff_rtsp_close_streams(AVFormatContext *s)
     av_free(rt->recvbuf);
 }
 
-static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
-                               URLContext *handle)
+static AVFormatContext *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
+                                          URLContext *handle, int packet_size)
 {
     AVFormatContext *rtpctx;
     int ret;
@@ -539,7 +539,7 @@ static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
     if (handle) {
         url_fdopen(&rtpctx->pb, handle);
     } else
-        url_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE);
+        url_open_dyn_packet_buf(&rtpctx->pb, packet_size);
     ret = av_write_header(rtpctx);
 
     if (ret) {
@@ -572,7 +572,8 @@ static int rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
         s->ctx_flags |= AVFMTCTX_NOHEADER;
 
     if (s->oformat) {
-        rtsp_st->transport_priv = rtsp_rtp_mux_open(s, st, rtsp_st->rtp_handle);
+        rtsp_st->transport_priv = rtsp_rtp_mux_open(s, st, rtsp_st->rtp_handle,
+                                                    RTSP_TCP_MAX_PACKET_SIZE);
         /* Ownership of rtp_handle is passed to the rtp mux context */
         rtsp_st->rtp_handle = NULL;
     } else if (rt->transport == RTSP_TRANSPORT_RDT)

-- 
Libav/FFmpeg packaging