Merge commit '913aa9a4874418724183a3ec862cdc63b829367d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 23:02:18 +0000 (00:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 23:02:27 +0000 (00:02 +0100)
* commit '913aa9a4874418724183a3ec862cdc63b829367d':
  libx264: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libx264.c

Simple merge