summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Rapp <t.rapp@noa-archive.com>2016-12-23 14:50:16 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-01-26 00:34:12 +0100
commitd5154c055bab178287f44a3625cff0e57c448b84 (patch)
treef0960787cd12ec23ba38d8b39847d804521a19fd
parentcd81993070e8d53982430c42bd2210c549ae34cc (diff)
downloadffmpeg-d5154c055bab178287f44a3625cff0e57c448b84.tar.gz
avformat/avidec: skip odml master index chunks in avi_sync
Fixes pts gaps when reading AVI files > 256GiB generated by FFmpeg. Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6d579d7c1bdc4126955cae7f385208e455685986) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/avidec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index e5a292ee42..ebd14abb12 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1203,7 +1203,8 @@ start_sync:
if ((d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) ||
// parse JUNK
(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') ||
- (d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')) {
+ (d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1') ||
+ (d[0] == 'i' && d[1] == 'n' && d[2] == 'd' && d[3] == 'x')) {
avio_skip(pb, size);
goto start_sync;
}