aboutsummaryrefslogtreecommitdiffstats
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-02-08 21:17:51 +0100
commit3f3ee3e62fd6f1a62d4fe4ec7140a4f83fadd8ed (patch)
tree2fdcc534ce43a7db91362b1acf9c9159c7b0f40a
parent8be687a81f9beb818f0ddf44491ba259f1dcca1b (diff)
downloadffmpeg-3f3ee3e62fd6f1a62d4fe4ec7140a4f83fadd8ed.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 d2904ab7d2..cbe6c85636 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1187,7 +1187,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;
}