[FFmpeg-cvslog] Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 23 11:42:16 2015 +0100| [96b495f443832082777d7dad7349dd6ec97b6cb9] | committer: Michael Niedermayer

Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'

* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
	libavcodec/libschroedinger.c

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

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