OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f02f745
)
adts: Fix PCE copying.
author
Alex Converse
<alex.converse@gmail.com>
Wed, 29 Jun 2011 20:41:47 +0000
(13:41 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Thu, 7 Jul 2011 05:38:59 +0000
(22:38 -0700)
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.
libavformat/adtsenc.c
patch
|
blob
|
history
diff --git
a/libavformat/adtsenc.c
b/libavformat/adtsenc.c
index
e858a81
..
75649e2
100644
(file)
--- 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);