From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Dec 2014 03:43:53 +0000 (+0100)
Subject: Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
X-Git-Tag: n2.7-dev~1502
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/445ec2dfcbdc448fb9e6c88049d815f663fcb8a2

Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'

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

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

445ec2dfcbdc448fb9e6c88049d815f663fcb8a2