[FFmpeg-cvslog] Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 17 15:27:50 2016 +0000| [470bfab470893d45328f4e6e25d60b89c9af1abe] | committer: Derek Buitenhuis

Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'

* commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6':
  configure: Use `require` for the non-component options

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

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