Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'

* commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15': aac: Relax reserved_bit validation Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · b5ca158935
parent 87db7e7772 87e85a133f
commit b5ca158935
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@ -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);