Merge commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:02:15 +0000 (09:02 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:02:15 +0000 (09:02 +0200)
commit9dc30d08114068ccfe65e89c3c46deee3e6a2289
tree6fab06ee98b64e11d506dde9a5000f716d3cb631
parentfdca9350139bae44623b90a7db4d8116c3487372
parent87de6ddb7b7674e329d5c96677bd8685bc7f7855
Merge commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855'

* commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855':
  libfdk-aacdec: Bump the max number of channels to 8

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libfdk-aacdec.c