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_qt.c | |
| parent | be2c0adc968d3f8fc4a72dea7117529016f0a1ad (diff) | |
| parent | 90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59 (diff) | |
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_qt.c')
| -rw-r--r-- | libavformat/rtpdec_qt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index f0f01d9b19..9631b0ae19 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -42,7 +42,7 @@ struct PayloadContext { static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, - int len, int flags) + int len, uint16_t seq, int flags) { AVIOContext pb; GetBitContext gb; |