Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:30:51 +0000 (01:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:31:15 +0000 (01:31 +0200)
commit476692abdb3207b722c2cbbd9ea3720004aae440
treee8b6239290da2a3583e6ea7a05e27b15290a6d8b
parent8eb2c411c1e56be522cce65b8acf92dd8b9fbfdd
parenta188108ebf28ebac9d2b8fc7d5b391aef45698b3
Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c
libavcodec/aacdectab.h