Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'

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

See: 066dc04373 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/136/head
Michael Niedermayer 10 years ago
commit 8b94cee99b

Diff Content Not Available