[FFmpeg-cvslog] Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 21:00:33 2015 +0100| [8f92c0898d2b042374d98ab60ec4dd57f4dc2874] | committer: Michael Niedermayer

Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'

* commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9':
  siff: Use the correct type for packet size variables

Conflicts:
	libavformat/siff.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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