From: James Almer <jamrial@gmail.com>
Date: Fri, 14 Sep 2018 02:16:18 +0000 (-0300)
Subject: Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1b98bfb932ad36667ea7f18e24c54978623f6654;p=ffmpeg

Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'

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

Merged-by: James Almer <jamrial@gmail.com>
---

1b98bfb932ad36667ea7f18e24c54978623f6654