[FFmpeg-cvslog] Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 18:04:51 2016 +0000| [9fad1ce7c95adeec440f51af77f730340a6d27b8] | committer: Derek Buitenhuis

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 at gmail.com>

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