diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:46:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:46:43 +0100 |
| commit | bb3420d88e71ee9bb04166467dde3056ff3aa2b6 (patch) | |
| tree | 6153ab3fbc83a4f033cb3aa1f6f1b935068e505b /libavformat/rtpdec.c | |
| parent | be2c0adc968d3f8fc4a72dea7117529016f0a1ad (diff) | |
| parent | 90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59 (diff) | |
| download | ffmpeg-bb3420d88e71ee9bb04166467dde3056ff3aa2b6.tar.gz | |
Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'
* commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59':
rtpdec: Pass the sequence number to depacketizers
configure: Make avconv depend on null, anull and resample filters
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index b0f0aaa4b0..8a80e03b77 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -539,7 +539,7 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, return 0; } else if (s->parse_packet) { rv = s->parse_packet(s->ic, s->dynamic_protocol_context, - s->st, pkt, ×tamp, buf, len, flags); + s->st, pkt, ×tamp, buf, len, seq, flags); } else { /* At this point, the RTP header has been stripped; * This is ASSUMING that there is only 1 CSRC, which isn't wise. */ @@ -685,7 +685,8 @@ static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt, * the packet is left with pts == AV_NOPTS_VALUE */ timestamp = RTP_NOTS_VALUE; rv = s->parse_packet(s->ic, s->dynamic_protocol_context, - s->st, pkt, ×tamp, NULL, 0, flags); + s->st, pkt, ×tamp, NULL, 0, 0, + flags); finalize_packet(s, pkt, timestamp); return rv; } else { |