Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 02:05:45 +0000 (04:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 02:06:42 +0000 (04:06 +0200)
commit35c8dda5c2dbeb37c659f964372edf6f2bde3b5f
tree527c264b1199c541bd0286638f74e63e9270647f
parenta8e137a32286adddeb08f4f156c16cfe8bbf612e
parent2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1
Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'

* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
  mov: Adjust variable types to fix format warnings

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