[FFmpeg-cvslog] Merge commit '16158da9607f2f84232d3dd381406b2f2449ec74'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 12:16:07 2014 +0100| [ba1a19bc35e4a6b9dc421feb92e3f15fa16adb8b] | committer: Michael Niedermayer

Merge commit '16158da9607f2f84232d3dd381406b2f2449ec74'

* commit '16158da9607f2f84232d3dd381406b2f2449ec74':
  hnm4: Use av_image_check_size

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba1a19bc35e4a6b9dc421feb92e3f15fa16adb8b
---