Merge commit '2edaafe5b93832715781851dfe2663da228a05ad'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:13:14 +0000 (14:13 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:13:14 +0000 (14:13 -0300)
* commit '2edaafe5b93832715781851dfe2663da228a05ad':
  libfdk-aacdec: Allow setting the new dynamic range control effect setting

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/libfdk-aacdec.c

Simple merge