[FFmpeg-cvslog] Merge commit '1b90433f79de857550d4d8c35c89fbe954920594'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Aug 18 09:05:54 2015 +0200| [4cf4831ae7e2b6ccbea9c2d65605a3722aeac9c2] | committer: Hendrik Leppkes

Merge commit '1b90433f79de857550d4d8c35c89fbe954920594'

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

Conflicts:
	libavcodec/libfdk-aacdec.c

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

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