diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-03-03 19:38:32 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-03-04 16:36:16 +0000 |
| commit | 87e85a133f3ce2f037b90e9c7bbca99951df6c15 (patch) | |
| tree | 9dd099c081b66e1308ddb3792d5eb5b0691a2a7a | |
| parent | 25f613f8be3b51e4396b93cda131e4631ba54302 (diff) | |
| download | ffmpeg-87e85a133f3ce2f037b90e9c7bbca99951df6c15.tar.gz | |
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 <vittorio.giovara@gmail.com>
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |