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)
commit8c9945285e30ed5f7be3b29b0e24f13bde5e5b66
tree2a3dfa598ce8a7a27a766b2a44431f68d840bc77
parentba1a19bc35e4a6b9dc421feb92e3f15fa16adb8b
parent57ed5a64feec4af1f16f9a74c63cfa9aa8147242
Merge commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242'

* commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242':
  hnm4: change width/height to int to fix hypothetical integer overflows

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