[FFmpeg-cvslog] Merge commit '2edc718723b60530aead26c20cbc891102f7d529'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 17:18:49 2016 +0000| [33215d3c4898165a9535f5dc3cdd40f7f041f3f3] | committer: Derek Buitenhuis

Merge commit '2edc718723b60530aead26c20cbc891102f7d529'

This is a no-op. This was a part of the already-reverted
broken configure saga.

* commit '2edc718723b60530aead26c20cbc891102f7d529':
  configure: Relax the implication of --enable for components

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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