[FFmpeg-cvslog] Merge commit '121314895f6360852b2807d5dfafea576b2e6fed'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 15 18:01:11 2018 -0300| [9a15af48284b951701b7e6b9dcc81b4212c6ca95] | committer: James Almer

Merge commit '121314895f6360852b2807d5dfafea576b2e6fed'

* commit '121314895f6360852b2807d5dfafea576b2e6fed':
  configure: Fix logic of AMF external library check

This commit is a noop. AMF is meant to be autodetected.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a15af48284b951701b7e6b9dcc81b4212c6ca95
---