Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Jan 2014 20:34:42 +0000 (21:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Jan 2014 20:34:42 +0000 (21:34 +0100)
commit220f0927b86f5a0d598949257ed22be946fa7f19
treee3f74dcb0806d75ae334c0a035c74aa20ad247e4
parentececbedaa86cddd883f6cdc12cdd1a75a0023550
parent8b76362836f3c373c3aadc544522edcbef16dd5f
Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'

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

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c