aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-29 01:06:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-29 01:22:22 +0200
commitc6eee3120a594cf25feb892f952a409a512d182e (patch)
treedfadf4547a680823f6805011d1bcf6077a9ce121 /configure
parent9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96 (diff)
parent35177ba77ff60a8b8839783f57e44bcc4214507a (diff)
downloadffmpeg-c6eee3120a594cf25feb892f952a409a512d182e.tar.gz
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index ed1d9a491f..fad934c3ff 100755
--- a/configure
+++ b/configure
@@ -4800,6 +4800,10 @@ enabled vdpau && enabled xlib &&
prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&
enable vdpau_x11
+enabled dxva2 &&
+ check_header dxva2api.h -D_WIN32_WINNT=0x0600 &&
+ prepend ffmpeg_libs $($ldflags_filter "-lole32")
+
# Funny iconv installations are not unusual, so check it after all flags have been set
disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv