diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-02 16:33:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 13:24:40 +0200 |
| commit | 336901e0601ed8067018e1c51c53b5114b887cf2 (patch) | |
| tree | 0bfd698e9cf4ebdf3df23232e0e0e216cd80c189 | |
| parent | e94b08f00217d54976d16d53d7eb820960e9cd4a (diff) | |
| download | ffmpeg-336901e0601ed8067018e1c51c53b5114b887cf2.tar.gz | |
avcodec/h263dec: use AV_EF_IGNORE_ERR
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 523fca9e7f..474714ed77 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -273,6 +273,8 @@ static int decode_slice(MpegEncContext *s) ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, ER_MB_ERROR & part_mask); + if (s->err_recognition & AV_EF_IGNORE_ERR) + continue; return AVERROR_INVALIDDATA; } diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 303e5475e5..ab55b591cd 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1084,7 +1084,8 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block, if (SHOW_UBITS(re, &s->gb, 1) == 0) { av_log(s->avctx, AV_LOG_ERROR, "1. marker bit missing in 3. esc\n"); - return -1; + if (!(s->err_recognition & AV_EF_IGNORE_ERR)) + return -1; } SKIP_CACHE(re, &s->gb, 1); @@ -1094,7 +1095,8 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block, if (SHOW_UBITS(re, &s->gb, 1) == 0) { av_log(s->avctx, AV_LOG_ERROR, "2. marker bit missing in 3. esc\n"); - return -1; + if (!(s->err_recognition & AV_EF_IGNORE_ERR)) + return -1; } SKIP_COUNTER(re, &s->gb, 1 + 12 + 1); |