[FFmpeg-cvslog] Merge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 22:47:02 2015 +0100| [dd4adba8112bc972ac6bf4147f7ab3cea4d5a105] | committer: Michael Niedermayer

Merge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4

* commit '3280b86c85f5a88397fce0230d1878fee79fbb93':
  swscale: check memory allocations

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

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