[FFmpeg-cvslog] Merge commit '21cca00dfeaec08ca93cf94ed33f4311cf1d8c84'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct  3 23:49:37 2017 -0300| [63b9fd75db40e576f9a4d6747b3ba54d1877c90d] | committer: James Almer

Merge commit '21cca00dfeaec08ca93cf94ed33f4311cf1d8c84'

* commit '21cca00dfeaec08ca93cf94ed33f4311cf1d8c84':
  build: Explicitly disable external libraries when not explicitly enabled

This commit is a noop.

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

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