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)
commit445ec2dfcbdc448fb9e6c88049d815f663fcb8a2
tree9af4db8c0ed77b7578530b135cfd7871b929139f
parent6781ec6714329da32b2e08be78e951ad1eb71534
parentac467d94fa6d9d626f77d4ca8125a5eb1ad5425d
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'

* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d':
  lcl: return an appropriate error code

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