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)
commitc7488f746154b5dcd70f8a3bef9a9fa5c42ac595
tree00f87888230f0dbabe75adac611f680db95969ae
parent94d98330ed6c5562341315c26c1af92771a2e6de
parent7e929dac100916fc45cb95e231025f3439c20156
Merge commit '7e929dac100916fc45cb95e231025f3439c20156'

* commit '7e929dac100916fc45cb95e231025f3439c20156':
  libfdk-aacenc: Allow enabling the ELDv2 profile

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