[FFmpeg-cvslog] Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 01:30:51 2015 +0200| [476692abdb3207b722c2cbbd9ea3720004aae440] | committer: Michael Niedermayer

Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'

* commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3':
  aac: Support channel configurations 11 and 12

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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