From 3f95f0dda55fca74b646937095a02a8fa9776622 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Wed, 17 Oct 2012 16:05:24 +0300 Subject: rtpdec: Move the URLContext used for RTCP RR out from the context, to a parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtpdec.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libavformat/rtpdec.h') diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 98e266a687..2d962c82c7 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -40,8 +40,7 @@ typedef struct RTPDynamicProtocolHandler RTPDynamicProtocolHandler; typedef struct RTPDemuxContext RTPDemuxContext; RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, - URLContext *rtpc, int payload_type, - int queue_size); + int payload_type, int queue_size); void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx, RTPDynamicProtocolHandler *handler); int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, @@ -69,10 +68,10 @@ void ff_rtp_send_punch_packets(URLContext* rtp_handle); /** * some rtp servers assume client is dead if they don't hear from them... - * so we send a Receiver Report to the provided ByteIO context + * so we send a Receiver Report to the provided URLContext * (we don't have access to the rtcp handle from here) */ -int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, int count); +int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, int count); // these statistics are used for rtcp receiver reports... typedef struct RTPStatistics { @@ -158,7 +157,6 @@ struct RTPDemuxContext { int read_buf_index; int read_buf_size; /* used to send back RTCP RR */ - URLContext *rtp_ctx; char hostname[256]; /** Statistics for this stream (used by RTCP receiver reports) */ -- cgit v1.2.3