[FFmpeg-cvslog] avcodec/mjpegdec fix last_dc for bits != 8
Michael Niedermayer
git at videolan.org
Fri Sep 6 01:26:03 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 6 00:55:32 2013 +0200| [15071ed4fc55b7cb048de7a5adc1cb41b7f8a8de] | committer: Michael Niedermayer
avcodec/mjpegdec fix last_dc for bits != 8
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15071ed4fc55b7cb048de7a5adc1cb41b7f8a8de
---
libavcodec/mjpegdec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 413be56..a1b7e8a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -760,7 +760,7 @@ static int handle_rstn(MJpegDecodeContext *s, int nb_components)
if(s->restart_count == 0 && s->avctx->codec_id == AV_CODEC_ID_THP){
align_get_bits(&s->gb);
for (i = 0; i < nb_components; i++) /* reset dc */
- s->last_dc[i] = 1024;
+ s->last_dc[i] = (4 << s->bits);
}
i = 8 + ((-get_bits_count(&s->gb)) & 7);
@@ -774,7 +774,7 @@ static int handle_rstn(MJpegDecodeContext *s, int nb_components)
skip_bits(&s->gb, 8);
if (get_bits_left(&s->gb) >= 8 && (get_bits(&s->gb, 8) & 0xF8) == 0xD0) {
for (i = 0; i < nb_components; i++) /* reset dc */
- s->last_dc[i] = 1024;
+ s->last_dc[i] = (4 << s->bits);
reset = 1;
} else
skip_bits_long(&s->gb, pos - get_bits_count(&s->gb));
@@ -1315,7 +1315,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
next_field:
for (i = 0; i < nb_components; i++)
- s->last_dc[i] = 1024;
+ s->last_dc[i] = (4 << s->bits);
if (s->lossless) {
av_assert0(s->picture_ptr == &s->picture);
More information about the ffmpeg-cvslog
mailing list