Merge commit '7e929dac100916fc45cb95e231025f3439c20156'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:13:28 +0000 (14:13 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:13:28 +0000 (14:13 -0300)
* commit '7e929dac100916fc45cb95e231025f3439c20156':
  libfdk-aacenc: Allow enabling the ELDv2 profile

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

Simple merge