Merge commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:27:12 +0000 (12:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:27:42 +0000 (12:27 +0100)
* commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242':
  hnm4: change width/height to int to fix hypothetical integer overflows

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

Trivial merge