diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 01:25:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 01:26:00 +0100 |
| commit | 376ee20614507df0e6d2004b7b0d10f72cb25167 (patch) | |
| tree | c95c7389a4d78098fa0dbb6704e869f41a5b06cf | |
| parent | 8bc7fe4daf5c26555d77e2261c96ee14a800fad4 (diff) | |
| download | ffmpeg-376ee20614507df0e6d2004b7b0d10f72cb25167.tar.gz | |
h263dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ituh263dec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 2c9385c579..7a34e7f49d 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -310,7 +310,7 @@ static int decode_slice(MpegEncContext *s){ max_extra+= 17; /* buggy padding but the frame should still end approximately at the bitstream end */ - if((s->workaround_bugs&FF_BUG_NO_PADDING) && (s->err_recognition&AV_EF_BUFFER)) + if((s->workaround_bugs&FF_BUG_NO_PADDING) && (s->err_recognition&(AV_EF_BUFFER|AV_EF_AGGRESSIVE))) max_extra+= 48; else if((s->workaround_bugs&FF_BUG_NO_PADDING)) max_extra+= 256*256*256*64; diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index c622961dd2..bf03e1a1d6 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -484,7 +484,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block, level = get_bits(&s->gb, 8); if((level&0x7F) == 0){ av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y); - if(s->err_recognition & AV_EF_BITSTREAM) + if(s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT)) return -1; } if (level == 255) |