diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 00:55:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 01:19:37 +0200 |
| commit | 15071ed4fc55b7cb048de7a5adc1cb41b7f8a8de (patch) | |
| tree | 36b134794ed16a04ce5a1817d5626140fb4c1cb3 /libavcodec/mjpegdec.c | |
| parent | ae57e82469c99538dd14adbe73df663709d71758 (diff) | |
| download | android_external_ffmpeg-15071ed4fc55b7cb048de7a5adc1cb41b7f8a8de.tar.gz android_external_ffmpeg-15071ed4fc55b7cb048de7a5adc1cb41b7f8a8de.tar.bz2 android_external_ffmpeg-15071ed4fc55b7cb048de7a5adc1cb41b7f8a8de.zip | |
avcodec/mjpegdec fix last_dc for bits != 8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 413be5691a..a1b7e8a6e9 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); |