Browse Source

avcodec/h263dec: use AV_EF_IGNORE_ERR

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
336901e060
2 changed files with 6 additions and 2 deletions
  1. +2
    -0
      libavcodec/h263dec.c
  2. +4
    -2
      libavcodec/mpeg4videodec.c

+ 2
- 0
libavcodec/h263dec.c View File

@@ -273,6 +273,8 @@ static int decode_slice(MpegEncContext *s)
ff_er_add_slice(&s->er, s->resync_mb_x, s->resync_mb_y, 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); s->mb_x, s->mb_y, ER_MB_ERROR & part_mask);


if (s->err_recognition & AV_EF_IGNORE_ERR)
continue;
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }




+ 4
- 2
libavcodec/mpeg4videodec.c View File

@@ -1084,7 +1084,8 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block,
if (SHOW_UBITS(re, &s->gb, 1) == 0) { if (SHOW_UBITS(re, &s->gb, 1) == 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"1. marker bit missing in 3. esc\n"); "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); 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) { if (SHOW_UBITS(re, &s->gb, 1) == 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"2. marker bit missing in 3. esc\n"); "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); SKIP_COUNTER(re, &s->gb, 1 + 12 + 1);


Loading…
Cancel
Save