diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 00:09:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 00:10:42 -0300 |
| commit | d99c3af7072d0011c4f2cbedb2f624e6b616cfc0 (patch) | |
| tree | 7ae25b82a8c95c0937243732399ebc8e658071ba /libavformat | |
| parent | 2838ab65ccf5e3ceefe9819c1aee6edd7f3e4d90 (diff) | |
| parent | b446f0e98f85e2e931b476e52b319f1c49244660 (diff) | |
| download | ffmpeg-d99c3af7072d0011c4f2cbedb2f624e6b616cfc0.tar.gz | |
Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'
* commit 'b446f0e98f85e2e931b476e52b319f1c49244660':
mov: Do not try to parse multiple stsd for the same track
See 8b43ee4054af799e388d380b379a13a60849c1b5
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 19cda1424d..ede9cda9d3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2371,9 +2371,11 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) } 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; } + /* Prepare space for hosting multiple extradata. */ sc->extradata = av_mallocz_array(entries, sizeof(*sc->extradata)); sc->extradata_size = av_mallocz_array(entries, sizeof(*sc->extradata_size)); |