From 1deeb9437c9c0e1f9cb708b24a4d0dedaee7bab3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 6 Sep 2013 00:56:44 +0200 Subject: [PATCH] avcodec/mjpegdec: Fix normal jpeg with bits < 8 Untested due to lack of testcase Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index a1b7e8a6e9..0d619efe49 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1121,6 +1121,12 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, return AVERROR_INVALIDDATA; } s->dsp.idct_put(ptr, linesize[c], s->block); + if (s->bits & 7) { + int block_x, block_y; + for (block_y=0; block_y<8; block_y++) + for (block_x=0; block_x<8; block_x++) + *(ptr + 2*block_x + block_y*linesize[c]) <<= 8 - s->bits; + } } } else { int block_idx = s->block_stride[c] * (v * mb_y + y) +