Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / jvdec.c

diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index aea2cc1bed3275de306c7fa8b4c60a69565fa5e1..d371950b6ee45e5eebf5933f04e3bb3e059739cc 100644 (file)
--- 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)