Commit 13eed267 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '31931520'

* commit '31931520':
  mov: Do not allow updating the time scale after it has been set
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 38b701a3 31931520
...@@ -836,6 +836,11 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) ...@@ -836,6 +836,11 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
sc = st->priv_data; 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); version = avio_r8(pb);
if (version > 1) { if (version > 1) {
avpriv_request_sample(c->fc, "Version %d", version); avpriv_request_sample(c->fc, "Version %d", version);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment