generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adts: Fix PCE copying.

Browse Source 
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 7f01a4192c)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Alex Converse
2011-06-29 13:41:47 -07:00
committed by Anton Khirnov
parent 2649439bbd
commit baec70e16f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/adtsenc.c
View File

@@ -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"); av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in ADTS\n");
return -1; 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) { if (!adts->channel_conf) {
init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE); init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE);