diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:13:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:13:30 +0100 |
| commit | ea96feddb7bb813c1e0c9befe9c96bf73996f841 (patch) | |
| tree | 1669d72b0c1baeb033c3b2f28faf62ccd53978e5 /libavformat/rtsp.c | |
| parent | e1cf1a9c89dbb3b867c50421cf543221a4d223f9 (diff) | |
| parent | 3f95f0dda55fca74b646937095a02a8fa9776622 (diff) | |
| download | ffmpeg-streaming-ea96feddb7bb813c1e0c9befe9c96bf73996f841.zip ffmpeg-streaming-ea96feddb7bb813c1e0c9befe9c96bf73996f841.tar.gz | |
Merge commit '3f95f0dda55fca74b646937095a02a8fa9776622'
* commit '3f95f0dda55fca74b646937095a02a8fa9776622':
rtpdec: Move the URLContext used for RTCP RR out from the context, to a parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -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 04ea47c..bac0752 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -644,7 +644,7 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) rtsp_st->dynamic_protocol_context, rtsp_st->dynamic_handler); else if (CONFIG_RTPDEC) - rtsp_st->transport_priv = ff_rtp_parse_open(s, st, rtsp_st->rtp_handle, + rtsp_st->transport_priv = ff_rtp_parse_open(s, st, rtsp_st->sdp_payload_type, reordering_queue_size); @@ -1856,7 +1856,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt) case RTSP_LOWER_TRANSPORT_UDP_MULTICAST: len = udp_read_packet(s, &rtsp_st, rt->recvbuf, RECVBUF_SIZE, wait_end); if (len > 0 && rtsp_st->transport_priv && rt->transport == RTSP_TRANSPORT_RTP) - ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, len); + ff_rtp_check_and_send_back_rr(rtsp_st->transport_priv, rtsp_st->rtp_handle, len); break; } if (len == AVERROR(EAGAIN) && first_queue_st && |
