Merge commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 08:48:34 +0000 (09:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 08:48:34 +0000 (09:48 +0100)
* commit 'd1c229cdbc07ef8eb703d68d1c5b509baee85245':
  lavf: do not use int to store an int64

Conflicts:
libavformat/utils.c

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

Trivial merge