diff mbox

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

Message ID 1482501016-3566-1-git-send-email-t.rapp@noa-archive.com
State Accepted
Commit 6d579d7c1bdc4126955cae7f385208e455685986
Headers show

Commit Message

Tobias Rapp Dec. 23, 2016, 1:50 p.m. UTC
Fixes pts gaps when reading AVI files > 256GiB generated by FFmpeg.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
---
 libavformat/avidec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Michael Niedermayer Dec. 23, 2016, 8:49 p.m. UTC | #1
On Fri, Dec 23, 2016 at 02:50:16PM +0100, Tobias Rapp wrote:
> Fixes pts gaps when reading AVI files > 256GiB generated by FFmpeg.
> 
> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
> ---
>  libavformat/avidec.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

applied

thx

[...]
Tobias Rapp Jan. 4, 2017, 7:50 a.m. UTC | #2
On 23.12.2016 21:49, Michael Niedermayer wrote:
> On Fri, Dec 23, 2016 at 02:50:16PM +0100, Tobias Rapp wrote:
>> Fixes pts gaps when reading AVI files > 256GiB generated by FFmpeg.
>>
>> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
>> ---
>>  libavformat/avidec.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> applied
>
> thx

It would be nice to backport this fix to releases which have commit 
bbcc09518e0d1efc189a43ff0120c1a31f51c802 included (2.7 and later AFAICS).

Regards,
Tobias
diff mbox

Patch

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index d465965..4a054ee 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1211,7 +1211,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;
         }