[FFmpeg-cvslog] mjpegdec: initialize source variables before gbr remap

[Michael Niedermayer]

ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 11 02:29:46 2013 +0200| [6127f792f900ce8f9f02c44ed6de0d989bf750dc] | committer: Michael Niedermayer

mjpegdec: initialize source variables before gbr remap

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 94e86ae15a4328b22f6f103b9fd9b6a9ee0c676c)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6127f792f900ce8f9f02c44ed6de0d989bf750dc
---

 libavcodec/mjpegdec.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index dac8386..72f482f 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);