msmpeg4dec: restore error concealment functionality after merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · b95565074f
parent c9cab022a3
commit b95565074f
1 changed files with 1 additions and 1 deletions
--- 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{