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)
* commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855':
  libfdk-aacdec: Bump the max number of channels to 8

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

Simple merge