Commit 3d742230 authored by Martin Storsjö's avatar Martin Storsjö

rtsp: Make rtsp_rtp_mux_open reusable

Originally committed as revision 25409 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9e6acc78
...@@ -502,8 +502,8 @@ void ff_rtsp_close_streams(AVFormatContext *s) ...@@ -502,8 +502,8 @@ void ff_rtsp_close_streams(AVFormatContext *s)
av_free(rt->recvbuf); av_free(rt->recvbuf);
} }
static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st, static AVFormatContext *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
URLContext *handle) URLContext *handle, int packet_size)
{ {
AVFormatContext *rtpctx; AVFormatContext *rtpctx;
int ret; int ret;
...@@ -539,7 +539,7 @@ static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st, ...@@ -539,7 +539,7 @@ static void *rtsp_rtp_mux_open(AVFormatContext *s, AVStream *st,
if (handle) { if (handle) {
url_fdopen(&rtpctx->pb, handle); url_fdopen(&rtpctx->pb, handle);
} else } 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); ret = av_write_header(rtpctx);
if (ret) { if (ret) {
...@@ -572,7 +572,8 @@ static int rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) ...@@ -572,7 +572,8 @@ static int rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;
if (s->oformat) { 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 */ /* Ownership of rtp_handle is passed to the rtp mux context */
rtsp_st->rtp_handle = NULL; rtsp_st->rtp_handle = NULL;
} else if (rt->transport == RTSP_TRANSPORT_RDT) } else if (rt->transport == RTSP_TRANSPORT_RDT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment