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)
commit1902bbbe722504dac5966df3d417a1ed8029aea1
tree757b9fe32bc8501bc38bcd9a2f40520bb2875132
parent73c85d3af2420baeee9a8f0429b34012096606ea
parentcd7a2e1502f174c725c0de82711d2c7649057574
Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'

* commit 'cd7a2e1502f174c725c0de82711d2c7649057574':
  asfdec: fix reading files larger than 2GB

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