diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:23:19 +0100 |
| commit | 8d0b2aae71f01904e4a7ac0e8795592da5a0bd89 (patch) | |
| tree | e0bfc884210a851e22fd1acabb6b9e873cef5bb4 /libavformat/rtpdec.h | |
| parent | ea96feddb7bb813c1e0c9befe9c96bf73996f841 (diff) | |
| parent | e96406eda4f143f101bd44372f7b2d542183000a (diff) | |
Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'
* commit 'e96406eda4f143f101bd44372f7b2d542183000a':
rtsp: Add support for depacketizing RTP data via custom IO
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.h')
| -rw-r--r-- | libavformat/rtpdec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 407c6d005d..d7ade3bb41 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -68,10 +68,11 @@ 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 URLContext + * so we send a Receiver Report to the provided URLContext or AVIOContext * (we don't have access to the rtcp handle from here) */ -int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, int count); +int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, + AVIOContext *avio, int count); // these statistics are used for rtcp receiver reports... typedef struct RTPStatistics { |