diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-08 01:05:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-08 01:05:28 +0200 |
| commit | 5d1b39f7e7381a2e837b9b6d43dede7de528da3c (patch) | |
| tree | 5d0f96c4324c637d436e1aaf2f45aee1eb9f99b6 /libavformat/adtsenc.c | |
| parent | ebd1edf36c81155e2817edaa056b0bc9eb21e8f5 (diff) | |
| parent | 2f138f0b7c36fe50b51e0d74bc913d14aea00c5e (diff) | |
| download | ffmpeg-5d1b39f7e7381a2e837b9b6d43dede7de528da3c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: clean up library installation rules
vf_drawtext: Remove some write-only variables.
libgsm: Drop const qualifier to silence compiler warning.
docs: Remove needless configure options
docs: Don't recommend adding --enable-memalign-hack
libvo-amrwbenc: Add braces to shut up gcc warning.
adts: Fix PCE copying.
Conflicts:
configure
doc/general.texi
subdir.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/adtsenc.c')
| -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 a03e128d96..43e719b5ea 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); |