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)
commit94d98330ed6c5562341315c26c1af92771a2e6de
tree9dd0bbcbce8d04b5b2f609f569acb2687ad19932
parent203bbaccfaaeac9548862e83792d38509a8c8167
parent2edaafe5b93832715781851dfe2663da228a05ad
Merge commit '2edaafe5b93832715781851dfe2663da228a05ad'

* commit '2edaafe5b93832715781851dfe2663da228a05ad':
  libfdk-aacdec: Allow setting the new dynamic range control effect setting

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