diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 02:29:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 12:06:57 +0200 |
| commit | 6127f792f900ce8f9f02c44ed6de0d989bf750dc (patch) | |
| tree | 7f83fa399b595726fd9ddb8e1bf19e9f8fcb25c8 /libavcodec/mjpegdec.c | |
| parent | fd2cf9c45d3b380cf3dfbdb5dac2fc14caa54de5 (diff) | |
| download | ffmpeg-6127f792f900ce8f9f02c44ed6de0d989bf750dc.tar.gz | |
mjpegdec: initialize source variables before gbr remap
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94e86ae15a4328b22f6f103b9fd9b6a9ee0c676c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |