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/rtpdec.h | |
| parent | e1cf1a9c89dbb3b867c50421cf543221a4d223f9 (diff) | |
| parent | 3f95f0dda55fca74b646937095a02a8fa9776622 (diff) | |
| download | ffmpeg-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/rtpdec.h')
| -rw-r--r-- | libavformat/rtpdec.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index fb1acc279d..407c6d005d 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) */ |