From 87e85a133f3ce2f037b90e9c7bbca99951df6c15 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 3 Mar 2015 19:38:32 +0000 Subject: aac: Relax reserved_bit validation 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 --- libavcodec/aacdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index c4234e7317..7236a053de 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -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); -- cgit v1.2.3