[FFmpeg-cvslog] Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Dec  7 15:57:02 2015 +0100| [e92aa34d7ba50ceb4bb51a1bc906cd9f60c6cc9b] | committer: Hendrik Leppkes

Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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