|
|
@ -1437,7 +1437,7 @@ 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"); |
|
|
|
if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR)) |
|
|
|
if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR) || get_bits_left(&s->gb) <= 0) |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
} |
|
|
|
} |
|
|
|
SKIP_CACHE(re, &s->gb, 1); |
|
|
|
SKIP_CACHE(re, &s->gb, 1); |
|
|
@ -1448,7 +1448,7 @@ 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"); |
|
|
|
if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR)) |
|
|
|
if (!(s->avctx->err_recognition & AV_EF_IGNORE_ERR) || get_bits_left(&s->gb) <= 0) |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|