Merge commit '16158da9607f2f84232d3dd381406b2f2449ec74'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:16:07 +0000 (12:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:19:08 +0000 (12:19 +0100)
commitba1a19bc35e4a6b9dc421feb92e3f15fa16adb8b
tree2a3dfa598ce8a7a27a766b2a44431f68d840bc77
parent0e85a28fa434385d6a0465bf44b95f8820683f56
parent16158da9607f2f84232d3dd381406b2f2449ec74
Merge commit '16158da9607f2f84232d3dd381406b2f2449ec74'

* commit '16158da9607f2f84232d3dd381406b2f2449ec74':
  hnm4: Use av_image_check_size

See: e23b18321fb5cffb6e05d0b0ef00de9733f560da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hnm4video.c