diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 18:51:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 18:52:05 +0200 |
| commit | ee08beb7d92150c61824a8eee722a6e4677a090c (patch) | |
| tree | ff4e4431ea2c5a81849bd41530a94a5e483cfb3d | |
| parent | 511638151102462627ad54e3dffb9aa9cc9afe5e (diff) | |
| parent | e97446e600578392549ef6d0191f2020dae7f8bf (diff) | |
| download | ffmpeg-ee08beb7d92150c61824a8eee722a6e4677a090c.tar.gz | |
Merge commit 'e97446e600578392549ef6d0191f2020dae7f8bf'
* commit 'e97446e600578392549ef6d0191f2020dae7f8bf':
configure: Check for DXVA2_ConfigPictureDecode instead of LPDIRECT3DSURFACE9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2334,7 +2334,7 @@ zmbv_encoder_select="zlib" # hardware accelerators crystalhd_deps="libcrystalhd_libcrystalhd_if_h" d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder" -dxva2_deps="dxva2api_h LPDIRECT3DSURFACE9" +dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" vaapi_deps="va_va_h" vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads" vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" @@ -5029,7 +5029,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 +check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0600 if ! disabled w32threads && ! enabled pthreads; then check_func_headers "windows.h process.h" _beginthreadex && |