diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 01:26:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 01:26:28 +0100 |
| commit | b95565074f3090762aeda4b57dc7d78381f6be5f (patch) | |
| tree | f5459a9cd05c05fcd929f78f583ad5a0dc649001 /libavcodec/msmpeg4.c | |
| parent | c9cab022a38272ef878d7e9c397475edae434bd6 (diff) | |
| download | android_external_ffmpeg-b95565074f3090762aeda4b57dc7d78381f6be5f.tar.gz android_external_ffmpeg-b95565074f3090762aeda4b57dc7d78381f6be5f.tar.bz2 android_external_ffmpeg-b95565074f3090762aeda4b57dc7d78381f6be5f.zip | |
msmpeg4dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 7093aeaa83..3e52cde0d1 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -1810,7 +1810,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, i-= 192; if(i&(~63)){ const int left= get_bits_left(&s->gb); - if(((i+192 == 64 && level/qmul==-1) || !(s->err_recognition&AV_EF_BITSTREAM)) && left>=0){ + if(((i+192 == 64 && level/qmul==-1) || !(s->err_recognition&(AV_EF_BITSTREAM|AV_EF_COMPLIANT))) && left>=0){ av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y); break; }else{ |