diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:51:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:51:40 +0200 |
| commit | 82d9c4e5789cefc35567e9e5e2c06c03a070f605 (patch) | |
| tree | 8dbed72098ab66048df0112b146e2f1f407a4e3d /libavformat/mov.c | |
| parent | 5a284d076ffdca705204e3e4100917cd4dbda14c (diff) | |
| parent | 376589e5dd72aa2dd42500f456fca303fcdcad85 (diff) | |
| download | ffmpeg-streaming-82d9c4e5789cefc35567e9e5e2c06c03a070f605.zip ffmpeg-streaming-82d9c4e5789cefc35567e9e5e2c06c03a070f605.tar.gz | |
Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'
* commit '376589e5dd72aa2dd42500f456fca303fcdcad85':
mov: Read alternate absolute path in dref alis
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -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 7e406e2..4492e25 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -521,12 +521,14 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_DEBUG, "type %d, len %d\n", type, len); if (len&1) len += 1; - if (type == 2) { // absolute path + if (type == 2 || type == 18) { // absolute path av_free(dref->path); dref->path = av_mallocz(len+1); if (!dref->path) return AVERROR(ENOMEM); avio_read(pb, dref->path, len); + if (type == 18) // no additional processing needed + continue; if (len > volume_len && !strncmp(dref->path, dref->volume, volume_len)) { len -= volume_len; memmove(dref->path, dref->path+volume_len, len); |
