Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:40:20 +0000 (16:40 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:40:20 +0000 (16:40 -0300)
* 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@gmail.com>

Trivial merge