From: Michael Niedermayer Date: Thu, 19 Feb 2015 20:12:29 +0000 (+0100) Subject: Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23' X-Git-Tag: n2.6~394 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=99bcfe62278ffc11e2665e653dcb90336ec8d7ff Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23' * commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23': qsv_api: fix building with libmfx disabled Merged-by: Michael Niedermayer --- 99bcfe62278ffc11e2665e653dcb90336ec8d7ff