aac: Relax reserved_bit validation
authorVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 3 Mar 2015 19:38:32 +0000 (19:38 +0000)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Wed, 4 Mar 2015 16:36:16 +0000 (16:36 +0000)
Although the specification mandates this bit to zero, it may happen
that software tools incorrectly flip it to one, invalidating a possibly
valid stream.

Relax this restriction, by failing only when AV_EF_BITSTREAM is set.
This behaviour is similar to aac decoders in Firefox and Quicktime.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavcodec/aacdec.c

index c4234e7..7236a05 100644 (file)
@@ -1143,7 +1143,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);