]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'
authorJames Almer <jamrial@gmail.com>
Tue, 3 Oct 2017 23:12:15 +0000 (20:12 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 3 Oct 2017 23:12:15 +0000 (20:12 -0300)
* commit 'cd7a2e1502f174c725c0de82711d2c7649057574':
  asfdec: fix reading files larger than 2GB

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/asfdec_o.c

Simple merge