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 'b5f963bfec1f452c37eee900c7b11f065d10dd60'

Browse Source 
* commit 'b5f963bfec1f452c37eee900c7b11f065d10dd60':
  mov: Drop dref when unable to parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2015-11-19 14:11:45 +00:00
parent 218f46fc99 b5f963bfec
commit f7c3ec3a01
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mov.c
View File

@@ -518,7 +518,7 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
sc->drefs_count = entries; sc->drefs_count = entries;
for (i = 0; i < sc->drefs_count; i++) { for (i = 0; i < entries; i++) {
MOVDref *dref = &sc->drefs[i]; MOVDref *dref = &sc->drefs[i];
uint32_t size = avio_rb32(pb); uint32_t size = avio_rb32(pb);
int64_t next = avio_tell(pb) + size - 4; int64_t next = avio_tell(pb) + size - 4;
@@ -613,6 +613,11 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} else } else
avio_skip(pb, len); avio_skip(pb, len);
} }
} else {
av_log(c->fc, AV_LOG_DEBUG, "Unknown dref type 0x08%x size %d\n",
dref->type, size);
entries--;
i--;
} }
avio_seek(pb, next, SEEK_SET); avio_seek(pb, next, SEEK_SET);
} }