[FFmpeg-cvslog] Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 21:42:08 2015 +0100| [575ed4fe37fdb1558fbbc261661b6239d47bcd8c] | committer: Michael Niedermayer

Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'

* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()

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

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