From: Derek Buitenhuis Date: Wed, 24 Feb 2016 18:04:51 +0000 (+0000) Subject: Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c' X-Git-Tag: android-x86-7.1-r1~6260 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9fad1ce7c95adeec440f51af77f730340a6d27b8;p=android-x86%2Fexternal-ffmpeg.git 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 --- 9fad1ce7c95adeec440f51af77f730340a6d27b8