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_jpeg.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_jpeg.c')
| -rw-r--r-- | libavformat/rtpdec_jpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 391ae12cb3..80fe2952b3 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -219,7 +219,8 @@ static void create_default_qtables(uint8_t *qtables, uint8_t q) static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { uint8_t type, q, width, height; const uint8_t *qtables = NULL; |