diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-15 01:21:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-15 01:27:10 +0100 |
| commit | 67235dfa1d2b4bab2c8015e5b8e43ea63a681892 (patch) | |
| tree | 6de0622de5bbdf40c5770899bcfb989b31bcd2a4 /libavcodec/jvdec.c | |
| parent | 9e2ee46206a5a4db91ee4d26737b515797e6b08e (diff) | |
| parent | e0febda22d0e0fab094a9c886b0e0f0f662df1ef (diff) | |
| download | ffmpeg-67235dfa1d2b4bab2c8015e5b8e43ea63a681892.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: stricter reference limit enforcement.
h264: increase reference poc list from 16 to 32.
xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
snow: check reference frame indices.
snow: reject unsupported chroma shifts.
Add ffvhuff encoding and decoding regression test
anm: convert to bytestream2 API
bytestream: add more unchecked variants for bytestream2 API
jvdec: unbreak video decoding
jv demux: set video stream duration
fate: add pam image regression test
Conflicts:
libavcodec/adpcm.c
libavcodec/anm.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/snowdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jvdec.c')
| -rw-r--r-- | libavcodec/jvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index aea2cc1bed..d371950b6e 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -150,7 +150,7 @@ static int decode_frame(AVCodecContext *avctx, if (video_type == 0 || video_type == 1) { GetBitContext gb; - init_get_bits(&gb, buf, FFMIN(video_size, (buf_end - buf) * 8)); + init_get_bits(&gb, buf, 8 * FFMIN(video_size, buf_end - buf)); for (j = 0; j < avctx->height; j += 8) for (i = 0; i < avctx->width; i += 8) |