diff options
| author | Dustin Brody <libav@parsoma.net> | 2011-12-07 08:51:36 -0500 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-12-12 19:42:50 +0100 |
| commit | 5b22d6e1323989b078ad097c5b50dddbbf0fe251 (patch) | |
| tree | e0849f4ac32349b89bd198b3eb8d55e26a7470b1 /libavcodec/mpeg4videodec.c | |
| parent | f6cf4be821e1901d983233edff8e22fe310fd6f6 (diff) | |
| download | ffmpeg-5b22d6e1323989b078ad097c5b50dddbbf0fe251.tar.gz | |
lavc: convert error_recognition to err_recognition.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 2807d506ee..8bc30fdbb2 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -520,7 +520,7 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) if (code > 8){ if(get_bits1(&s->gb)==0){ /* marker */ - if(s->error_recognition>=2){ + if(s->err_recognition&AV_EF_BITSTREAM){ av_log(s->avctx, AV_LOG_ERROR, "dc marker bit missing\n"); return -1; } @@ -994,7 +994,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, else level= level * qmul - qadd; if((unsigned)(level + 2048) > 4095){ - if(s->error_recognition > FF_ER_COMPLIANT){ + if(s->err_recognition & AV_EF_BITSTREAM){ if(level > 2560 || level<-2560){ av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale); return -1; |