From: Michael Niedermayer Date: Tue, 25 Nov 2014 11:27:12 +0000 (+0100) Subject: Merge commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8c9945285e30ed5f7be3b29b0e24f13bde5e5b66;p=ffmpeg Merge commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242' * commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242': hnm4: change width/height to int to fix hypothetical integer overflows See: e23b18321fb5cffb6e05d0b0ef00de9733f560da Merged-by: Michael Niedermayer --- 8c9945285e30ed5f7be3b29b0e24f13bde5e5b66