[FFmpeg-cvslog] Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:40:20 2017 -0300| [28e012234a9bf9118a69a324de6392ce64fb65d2] | committer: James Almer

Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'

* commit '4f6401df43d7ee9082ea591037b9f9284217d834':
  configure: Merge separate parts of GnuTLS test
  configure: Simplify nvenc check (and move it to the correct spot)
  configure: Drop fallback for deprecated avserver command line options
  configure: Drop feature for randomly disabling/enabling components

This commit is a noop.

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

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