Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:59:25 +0000 (01:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:59:36 +0000 (01:59 +0100)
commit6cb8e40f4372a41dd72a001a72c17c0969f2a941
tree1ef4fb21d60f3776b022838468bc2f8265410c2f
parentb5b36e45b3282818b8374c8385a9c353a6ac3ff4
parente7ee74485b436c34591177c18c8643764a55d516
Merge commit 'e7ee74485b436c34591177c18c8643764a55d516' into release/2.4

* commit 'e7ee74485b436c34591177c18c8643764a55d516':
  hnm4: Use av_image_check_size

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