Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:04:51 +0000 (18:04 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:05:29 +0000 (18:05 +0000)
commit9fad1ce7c95adeec440f51af77f730340a6d27b8
tree34e045aacb2c306e90e761c9ec2810c793fe8117
parentf99195d56f4aab266926724ca1cfae822df4df16
parentb4a0f172c7f116d8d329ff02f29c138a9291fd3c
Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'

This commit is a no-op.

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

* commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c':
  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>