[FFmpeg-cvslog] Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 25 13:07:27 2014 +0200| [ee9b0199c8433499ebcbdc66d3ecce379ad3209c] | committer: Michael Niedermayer

Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'

* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

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

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