[FFmpeg-cvslog] Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 22:21:22 2015 +0100| [2a1b79d7e6596033618b23345aa24607f93e1614] | committer: Michael Niedermayer

Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'

* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
  swscale: Check memory allocations

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

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