From c36edf3899c80364341987a565d0ed7a5c3f6126 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 2 Nov 2011 02:26:28 +0100 Subject: [PATCH] jpeg: rgb support Fixes Ticket297 Based on a patch by Carl Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 9beb4649b5..7e69f28da6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -326,8 +326,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) if(s->rgb){ s->avctx->pix_fmt = PIX_FMT_BGRA; }else{ + if(s->component_id[0] == 'Q' && s->component_id[1] == 'F' && s->component_id[2] == 'A'){ + s->avctx->pix_fmt = PIX_FMT_GBR24P; + }else{ s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P; s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; + } } assert(s->nb_components==3); break; @@ -992,6 +996,9 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, && nb_components == 3 && s->nb_components == 3 && i) index = 3 - i; + if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == PIX_FMT_GBR24P) + index = (i+2)%3; + s->comp_index[i] = index; s->nb_blocks[i] = s->h_count[index] * s->v_count[index];