diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-06-29 13:41:47 -0700 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-11 12:26:10 +0200 |
| commit | baec70e16fd98c72a7ec9eaec70453a9279ad46c (patch) | |
| tree | bd31460a8415b52c21dbfbb99057e3cdbbd08c75 | |
| parent | 2649439bbdbf32af2bd07160c8a85ba55112af11 (diff) | |
| download | ffmpeg-baec70e16fd98c72a7ec9eaec70453a9279ad46c.tar.gz | |
adts: Fix PCE copying.
Parse the extension flag bit when reading the MPEG4 AudioSpecificConfig.
This has nothing to do with SBR/PS contradictory to what was noted when it was removed.
(cherry picked from commit 7f01a4192cdf4565eadee457f76e6b5196e35e0b)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/adtsenc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index e858a81d92..75649e24dc 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -59,6 +59,10 @@ int ff_adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in ADTS\n"); return -1; } + if (get_bits(&gb, 1)) { + av_log(s, AV_LOG_ERROR, "Extension flag is not allowed in ADTS\n"); + return -1; + } if (!adts->channel_conf) { init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE); |