[FFmpeg-cvslog] avformat/avidec: skip odml master index chunks in avi_sync

[Tobias Rapp]

ffmpeg | branch: release/3.1 | Tobias Rapp <t.rapp at noa-archive.com> | Fri Dec 23 14:50:16 2016 +0100| [c26cbe6c2e00515063e3b069398e9628a815929b] | committer: Michael Niedermayer

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 at noa-archive.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 6d579d7c1bdc4126955cae7f385208e455685986)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c26cbe6c2e00515063e3b069398e9628a815929b
---

 libavformat/avidec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 3c5f3ec..ebb21bd 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1193,7 +1193,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;
         }