diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:36:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:37:46 +0100 |
| commit | 30aa9b727da05d9bf3346ffabdbc983bd5f37616 (patch) | |
| tree | 266397b8aa8fb913c80831b39579fe6690b7d0de | |
| parent | a435a0337419e7080115a51c283ab0fbbd0ae83f (diff) | |
| parent | 46c0cbd5dc01196949105e49f2ded10aa85a6e39 (diff) | |
| download | ffmpeg-30aa9b727da05d9bf3346ffabdbc983bd5f37616.tar.gz | |
Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
rtsp: suppress a incompatible pointer types warning
Conflicts:
libavformat/rtsp.c
See: 00792322990188b1130ef2befd68ec1d51ab7365
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 3b88fc7271..9ee016cc61 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -729,8 +729,8 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) s->ctx_flags |= AVFMTCTX_NOHEADER; if (s->oformat && CONFIG_RTSP_MUXER) { - int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv, s, st, - rtsp_st->rtp_handle, + int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv, + s, st, rtsp_st->rtp_handle, RTSP_TCP_MAX_PACKET_SIZE, rtsp_st->stream_index); /* Ownership of rtp_handle is passed to the rtp mux context */ |