Commit b5ca1589 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '87e85a13'

* commit '87e85a13':
  aac: Relax reserved_bit validation
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 87db7e77 87e85a13
......@@ -1236,7 +1236,8 @@ static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics,
if (aot != AOT_ER_AAC_ELD) {
if (get_bits1(gb)) {
av_log(ac->avctx, AV_LOG_ERROR, "Reserved bit set.\n");
return AVERROR_INVALIDDATA;
if (ac->avctx->err_recognition & AV_EF_BITSTREAM)
return AVERROR_INVALIDDATA;
}
ics->window_sequence[1] = ics->window_sequence[0];
ics->window_sequence[0] = get_bits(gb, 2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment