Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jun 2015 17:23:06 +0000 (19:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jun 2015 17:23:34 +0000 (19:23 +0200)
commit120028968749cc65cc8eea491004d64bd5179487
tree99928091d96252b50fd99a229dfa2143d967c08c
parent6034b4bb88c1e5fc47fe2c2ff81835cb3dd4e872
parent0289f81241e720452b5a77713488d54d3ec252d7
Merge commit '0289f81241e720452b5a77713488d54d3ec252d7'

* commit '0289f81241e720452b5a77713488d54d3ec252d7':
  aac: Correctly map multichannel ADTS AAC with non-zero channel_config + PCE

Conflicts:
libavcodec/aacdec.c

Sample: 5.1ch_PCE_issue.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c