virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'

Browse Source 
* commit 'b446f0e98f85e2e931b476e52b319f1c49244660':
  mov: Do not try to parse multiple stsd for the same track

See 8b43ee4054

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-09-28 00:09:20 -03:00
parent 2838ab65cc b446f0e98f
commit d99c3af707
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@@ -2371,9 +2371,11 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
if (sc->extradata) { if (sc->extradata) {
av_log(c->fc, AV_LOG_ERROR, "Duplicate STSD\n"); av_log(c->fc, AV_LOG_ERROR,
"Duplicate stsd found in this track.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
/* Prepare space for hosting multiple extradata. */ /* Prepare space for hosting multiple extradata. */
sc->extradata = av_mallocz_array(entries, sizeof(*sc->extradata)); sc->extradata = av_mallocz_array(entries, sizeof(*sc->extradata));
sc->extradata_size = av_mallocz_array(entries, sizeof(*sc->extradata_size)); sc->extradata_size = av_mallocz_array(entries, sizeof(*sc->extradata_size));