[FFmpeg-cvslog] Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:52:01 2015 +0200| [73e150fff735d99193b2ebef902625d6ee4c8209] | committer: Michael Niedermayer

Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'

* commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9':
  huffyuv: Check memory allocation

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

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