Merge commit '141c960e21d2860e354f9b90df136184dd00a9a8'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:02:58 +0000 (14:02 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:02:58 +0000 (14:02 -0300)
commitee96ab2db507b95a694f10b152481cf71842de28
tree5354b78b56fca5c2cedee74dfd36cf454dd2ed42
parenta12063b118ad05409ff775ba30fab00265ad3031
parent141c960e21d2860e354f9b90df136184dd00a9a8
Merge commit '141c960e21d2860e354f9b90df136184dd00a9a8'

* commit '141c960e21d2860e354f9b90df136184dd00a9a8':
  libfdk-aacenc: Fix building with libfdk-aac v2

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