Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 14:57:02 +0000 (15:57 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 14:57:02 +0000 (15:57 +0100)
commite92aa34d7ba50ceb4bb51a1bc906cd9f60c6cc9b
tree2a0eafe81f573cb1e6f6188426db5a2c2a81cdb9
parentee367fadf5c1bcdf07fc0e4440c405ef74211733
parentd017ed878a45171f2f6c69fb9d76401c3c494110
Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'

* commit 'd017ed878a45171f2f6c69fb9d76401c3c494110':
  avi: Use the correct data type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/avidec.c