Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:19:26 +0000 (01:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 23:29:36 +0000 (01:29 +0200)
commit8eb2c411c1e56be522cce65b8acf92dd8b9fbfdd
tree1733466c92a06c2997cce97e527ad229ac588990
parentce838ad950fcf8b2a8823d7606a05077ebe91f9f
parent677c804aa3a78d61b21e6423165a252846c20f0e
Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'

* commit '677c804aa3a78d61b21e6423165a252846c20f0e':
  aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c