[FFmpeg-cvslog] Merge commit 'd3aa307da076e8820298b2c59ec5d6ff01a5e374'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 22 03:48:25 2015 +0100| [a3f5a8c3e06f330f7c572e454dad5dae85515ac7] | committer: Michael Niedermayer

Merge commit 'd3aa307da076e8820298b2c59ec5d6ff01a5e374'

* commit 'd3aa307da076e8820298b2c59ec5d6ff01a5e374':
  rmenc: Check memory allocation

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

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