diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 0002f016e9..262e213a61 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -713,6 +713,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) } s->mb_intra = 0; + s->last_dc[0] = s->last_dc[1] = s->last_dc[2] = 128 << s->intra_dc_precision; if (HAS_CBP(mb_type)) { s->bdsp.clear_blocks(s->block[0]); @@ -1631,6 +1632,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, s->mb_intra = 0; for (i = 0; i < 12; i++) s->block_last_index[i] = -1; + s->last_dc[0] = s->last_dc[1] = s->last_dc[2] = 128 << s->intra_dc_precision; if (s->picture_structure == PICT_FRAME) s->mv_type = MV_TYPE_16X16; else diff --git a/libavcodec/mpv_reconstruct_mb_template.c b/libavcodec/mpv_reconstruct_mb_template.c index dca982ae0f..4db85afef6 100644 --- a/libavcodec/mpv_reconstruct_mb_template.c +++ b/libavcodec/mpv_reconstruct_mb_template.c @@ -66,7 +66,7 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], if (is_mpeg12 != DEFINITELY_MPEG12_H261 && (s->h263_pred || s->h263_aic)) { if (s->mbintra_table[mb_xy]) ff_clean_intra_table_entries(s); - } else { + } else if (IS_ENCODER) { s->last_dc[0] = s->last_dc[1] = s->last_dc[2] = 128 << s->intra_dc_precision;