From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Mon, 24 Aug 2015 08:39:08 +0000 (+0200)
Subject: Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'
X-Git-Tag: n2.8~258
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/d2d6ca6f98ccb4a7c51fc4f45882e2461df6e1fc

Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'

* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e':
  aac: Make sure to set err on the failure path

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

d2d6ca6f98ccb4a7c51fc4f45882e2461df6e1fc