[FFmpeg-cvslog] Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 04:43:53 2014 +0100| [445ec2dfcbdc448fb9e6c88049d815f663fcb8a2] | committer: Michael Niedermayer

Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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