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-03 15:59:14 +0100
commita6639334df63639ae333f81c43098ed8ee360ee9 (patch)
tree88a303fb4a666b0cb78d7e4ae113622c4310eb6e
parent72d5addc0beadc0593bdd494de89281dd9f69255 (diff)
downloadffmpeg-a6639334df63639ae333f81c43098ed8ee360ee9.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 7adb819346..955b27b857 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1191,7 +1191,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;
}