aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 23:07:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 23:08:12 +0200
commit9ac3417c6b1934fee5a687df7b98e905b14719c2 (patch)
tree4c53c3a0967e208448c7fbec65eaf7427f1f4940
parent14617e3a739ea23e8da9adcdca4418f2b14a3956 (diff)
parentff7ae4b9df6e89d99dbd5434408123b80a4f6cd7 (diff)
downloadffmpeg-9ac3417c6b1934fee5a687df7b98e905b14719c2.tar.gz
Merge commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7'
* commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7': configure: Require LPDIRECT3DSURFACE9 for dxva2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 8460bc65c5..54ebf7cf75 100755
--- a/configure
+++ b/configure
@@ -2336,7 +2336,7 @@ zmbv_encoder_select="zlib"
# hardware accelerators
crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
-dxva2_deps="dxva2api_h"
+dxva2_deps="dxva2api_h LPDIRECT3DSURFACE9"
vaapi_deps="va_va_h"
vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
@@ -5034,6 +5034,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_type "windows.h dxva.h" "DXVA_PicParams_HEVC"
check_type "windows.h d3d11.h" "ID3D11VideoDecoder"
+check_type d3d9.h LPDIRECT3DSURFACE9
if ! disabled w32threads && ! enabled pthreads; then
check_func_headers "windows.h process.h" _beginthreadex &&