Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:43:53 +0000 (04:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:44:08 +0000 (04:44 +0100)
* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d':
  lcl: return an appropriate error code

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

Simple merge