Merge commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:11:39 +0000 (14:11 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 17:11:39 +0000 (14:11 -0300)
commit203bbaccfaaeac9548862e83792d38509a8c8167
treef7cda71f3318b98804c26b2e239fbfdd83720f49
parentf8377ffce35251bba043aeda5d81df0d411a0595
parentffb9b7a6bab6c6bfd3dd9a7c32e3724209824999
Merge commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999'

* commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999':
  libfdk-aac: Consistently use a proper version check macro for detecting features

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