From 7594ee2e6e9aada671c2958dea4848e828e9b178 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 18 Mar 2012 13:08:08 +0100 Subject: [PATCH] jpg: fix colors for sequential RGB Fixes Ticket850 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 19d44e4bd7..4c8015f44e 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1168,6 +1168,8 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == PIX_FMT_GBR24P) index = (i+2)%3; + if(nb_components == 1 && s->nb_components == 3 && s->avctx->pix_fmt == PIX_FMT_GBR24P) + index = (index+2)%3; s->comp_index[i] = index;