Merge commit 'b4a0f172'

This commit is a no-op.

We have already reverted the configure changes, and we do not have a typo
in configure.

* commit 'b4a0f172':
  Revert all recent configure changes related to dependency resolution
  build: Fix typo in HEVC VDPAU hwaccel dependencies
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>