[FFmpeg-cvslog] Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 02:11:01 2015 +0200| [8b94cee99bf13d3216294292a498b095f0947c90] | committer: Michael Niedermayer

Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'

* commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e':
  x264: Check memory allocation

See: 066dc0437368acd21546ee327a0a94c60c3808b2 and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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