diff options
| author | Martin Storsjö <martin@martin.st> | 2010-10-08 08:51:05 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-10-08 08:51:05 +0000 |
| commit | 3d7422302547b02256a4a1ab5552f180455b50a2 (patch) | |
| tree | 91deecf4e32d70020d10a5f5bb06bbe01cbc620e | |
| parent | 9e6acc7884ee58e59bd63f681cf8fe2ee5cebfba (diff) | |
| download | ffmpeg-3d7422302547b02256a4a1ab5552f180455b50a2.tar.gz | |
rtsp: Make rtsp_rtp_mux_open reusable
Originally committed as revision 25409 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rtsp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 6ddf149582..094ad79923 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) |