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/rdt.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/rdt.c')
-rw-r--r-- | libavformat/rdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 6404a5d5e3..695323ab0f 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -293,7 +293,7 @@ ff_rdt_parse_header(const uint8_t *buf, int len, static int rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t rtp_seq, int flags) { int seq = 1, res; AVIOContext pb; @@ -348,7 +348,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... rv= s->parse_packet(s->ic, s->dynamic_protocol_context, s->streams[s->prev_stream_id], - pkt, ×tamp, NULL, 0, flags); + pkt, ×tamp, NULL, 0, 0, flags); return rv; } @@ -375,7 +375,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, rv = s->parse_packet(s->ic, s->dynamic_protocol_context, s->streams[s->prev_stream_id], - pkt, ×tamp, buf, len, flags); + pkt, ×tamp, buf, len, 0, flags); return rv; } |