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)
* commit 'ffb9b7a6bab6c6bfd3dd9a7c32e3724209824999':
  libfdk-aac: Consistently use a proper version check macro for detecting features

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

Simple merge
Simple merge