diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 04:25:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 04:26:00 +0400 |
| commit | 376ee20614507df0e6d2004b7b0d10f72cb25167 (patch) | |
| tree | c95c7389a4d78098fa0dbb6704e869f41a5b06cf /libavcodec/h263dec.c | |
| parent | 8bc7fe4daf5c26555d77e2261c96ee14a800fad4 (diff) | |
h263dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 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; |