Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:39:08 +0000 (10:39 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:39:08 +0000 (10:39 +0200)
* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e':
  aac: Make sure to set err on the failure path

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge