[FFmpeg-cvslog] Merge commit 'b805482b1fba1d82fbe47023a24c9261f18979b6'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Dec  8 09:59:45 2015 +0100| [92186f2d1006c1a2cfcac79a656477f1ddeb34d9] | committer: Hendrik Leppkes

Merge commit 'b805482b1fba1d82fbe47023a24c9261f18979b6'

* commit 'b805482b1fba1d82fbe47023a24c9261f18979b6':
  aac: Provide more information on the failure message

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

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