highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

Browse Source 
* commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
	libavformat/rtsp.c

See: 0079232299
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-12 19:36:09 +01:00
parent a435a03374 46c0cbd5dc
commit 30aa9b727d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
View File

@@ -729,8 +729,8 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;
if (s->oformat && CONFIG_RTSP_MUXER) { if (s->oformat && CONFIG_RTSP_MUXER) {
int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv, s, st, int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv,
rtsp_st->rtp_handle, s, st, rtsp_st->rtp_handle,
RTSP_TCP_MAX_PACKET_SIZE, RTSP_TCP_MAX_PACKET_SIZE,
rtsp_st->stream_index); rtsp_st->stream_index);
/* Ownership of rtp_handle is passed to the rtp mux context */ /* Ownership of rtp_handle is passed to the rtp mux context */