diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 23:03:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 23:03:08 +0200 |
| commit | 210a437e105fbd92f1dd9c2c82f4a5efd80ca8fd (patch) | |
| tree | cc8e853469bf8e2e26b08d086c11cd19132edcd4 /libavformat | |
| parent | 3308b443f9342cd597a9d7440d2315f0a65b1566 (diff) | |
| parent | 54e03863691dcae73260f70108b3731b70773e7c (diff) | |
| download | ffmpeg-210a437e105fbd92f1dd9c2c82f4a5efd80ca8fd.tar.gz | |
Merge commit '54e03863691dcae73260f70108b3731b70773e7c' into release/0.10
* commit '54e03863691dcae73260f70108b3731b70773e7c':
vc1: check the source buffer in vc1_mc functions
bink: Bound check the quantization matrix.
xl: Make sure the width is valid
alsdec: Fix the clipping range
dsicinav: Bound-check the source buffer when needed
mov: Do not allow updating the time scale after it has been set
ac3dec: Don't consume more data than the actual input packet size
indeo: Reject impossible FRAMETYPE_NULL
Conflicts:
libavcodec/alsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 65d8798276..7ac838cf09 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -754,6 +754,11 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) st = c->fc->streams[c->fc->nb_streams-1]; sc = st->priv_data; + if (sc->time_scale) { + av_log(c->fc, AV_LOG_ERROR, "Multiple mdhd?\n"); + return AVERROR_INVALIDDATA; + } + version = avio_r8(pb); if (version > 1) { av_log_ask_for_sample(c, "unsupported version %d\n", version); |