diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:48:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 19:49:05 +0100 |
| commit | b5ca158935493f7242806f1bc59ea016672a1844 (patch) | |
| tree | bbe3fec0e0f1d8d9e6a0bd532d035a6a0368259f /libavcodec | |
| parent | 87db7e777262a7800cc6c76e07870f7a8f6301ed (diff) | |
| parent | 87e85a133f3ce2f037b90e9c7bbca99951df6c15 (diff) | |
| download | ffmpeg-b5ca158935493f7242806f1bc59ea016672a1844.tar.gz | |
Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'
* commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15':
aac: Relax reserved_bit validation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 9fafeaef50..daec5bc355 100644 --- 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); |