From: Michael Niedermayer Date: Thu, 11 Jul 2013 00:29:46 +0000 (+0200) Subject: mjpegdec: initialize source variables before gbr remap X-Git-Tag: android-x86-4.4-r1~2409 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94e86ae15a4328b22f6f103b9fd9b6a9ee0c676c;p=android-x86%2Fexternal-ffmpeg.git mjpegdec: initialize source variables before gbr remap Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index dac8386037..72f482f9db 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1231,6 +1231,10 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, && nb_components == 3 && s->nb_components == 3 && i) index = 3 - i; + s->nb_blocks[i] = s->h_count[index] * s->v_count[index]; + s->h_scount[i] = s->h_count[index]; + s->v_scount[i] = s->v_count[index]; + if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P) index = (i+2)%3; if(nb_components == 1 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBR24P) @@ -1238,10 +1242,6 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, s->comp_index[i] = index; - s->nb_blocks[i] = s->h_count[index] * s->v_count[index]; - s->h_scount[i] = s->h_count[index]; - s->v_scount[i] = s->v_count[index]; - s->dc_index[i] = get_bits(&s->gb, 4); s->ac_index[i] = get_bits(&s->gb, 4);