summaryrefslogtreecommitdiff
path: root/libavcodec/jvdec.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-03-14 03:02:02 +0000
committerJanne Grunau <janne-libav@jannau.net>2012-03-14 15:34:50 +0100
commita1c036e961a32f7208e7315dabfa0ee99d779edb (patch)
treefed628b382bcb6a45d64b6918950ede0c15acc87 /libavcodec/jvdec.c
parentd3d1b25e6991aaa171c1a4082164e15e6e5b1b83 (diff)
jvdec: unbreak video decoding
The safe bitstream reader broke it since the buffer size was specified in bytes instead of bits. Signed-off-by: Janne Grunau <janne-libav@jannau.net> CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/jvdec.c')
-rw-r--r--libavcodec/jvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index 5d4fdea009..ffa2f5a558 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)