[FFmpeg-cvslog] Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 15:56:45 2014 +0200| [db9c138616c9babc3a0f02c6b7289c774cc5b65c] | committer: Michael Niedermayer

Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'

* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28ba271fb9dde54cb26e7ae93ada2997df, and others
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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