[FFmpeg-cvslog] Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 13 21:34:42 2014 +0100| [220f0927b86f5a0d598949257ed22be946fa7f19] | committer: Michael Niedermayer

Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'

* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
  lavf: use a fixed width type

Conflicts:
	libavformat/utils.c

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

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