[FFmpeg-cvslog] Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  7 00:12:52 2015 +0100| [89388cf60bd5baa5991ee215a23d44f6d6b0c385] | committer: Michael Niedermayer

Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'

* commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1':
  msmpeg4: 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=89388cf60bd5baa5991ee215a23d44f6d6b0c385
---