[FFmpeg-cvslog] Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 05:37:11 2014 +0100| [c89751aa218c22e2d0febcafba4b01c533b8836e] | committer: Michael Niedermayer

Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'

* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
  imgconvert: check memory allocations and propagate errors

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

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