Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'
authorJames Almer <jamrial@gmail.com>
Fri, 14 Sep 2018 02:16:18 +0000 (23:16 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 14 Sep 2018 02:16:18 +0000 (23:16 -0300)
commit1b98bfb932ad36667ea7f18e24c54978623f6654
treebe3d5d0158dec3df7494dfe4f393b4417ec74139
parentf3b430e0e4969b30ff6360776174c751dc003bad
parent2a9e1c122eed66be1b26b747342b848300b226c7
Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'

* commit '2a9e1c122eed66be1b26b747342b848300b226c7':
  libfdk-aac: Don't use defined() in a #define

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