Merge commit '1b90433f79de857550d4d8c35c89fbe954920594'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:05:54 +0000 (09:05 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:05:54 +0000 (09:05 +0200)
commit4cf4831ae7e2b6ccbea9c2d65605a3722aeac9c2
treefc30426dbe9c0f6c4a5a55e48659f136f0789e10
parent9dc30d08114068ccfe65e89c3c46deee3e6a2289
parent1b90433f79de857550d4d8c35c89fbe954920594
Merge commit '1b90433f79de857550d4d8c35c89fbe954920594'

* commit '1b90433f79de857550d4d8c35c89fbe954920594':
  libfdk-aacdec: Always decode into an intermediate buffer

Conflicts:
libavcodec/libfdk-aacdec.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libfdk-aacdec.c