generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dxva2: include dxva.h if found

Browse Source 
Apparently, some build environments require dxva.h even for dxva2,
while others lack this header entirely.  Including it conditionally
allows building in both cases.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit fa84506177f0246b30d4ea6a99ee5d419f3e4550)

Conflicts:

	configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ronald S. Bultje 2012-06-24 11:17:13 +01:00 committed by Michael Niedermayer
parent ae8491ce33
commit b45a8f6d24
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1173,6 +1173,7 @@ HAVE_LIST="
dlfcn_h dlfcn_h
dlopen dlopen
dos_paths dos_paths
dxva_h
ebp_available ebp_available
ebx_available ebx_available
exp2 exp2
@ -3125,6 +3126,7 @@ check_func_headers windows.h VirtualAlloc
check_func_headers glob.h glob check_func_headers glob.h glob
check_header dlfcn.h check_header dlfcn.h
check_header dxva.h
check_header dxva2api.h -D_WIN32_WINNT=0x0600 check_header dxva2api.h -D_WIN32_WINNT=0x0600
check_header libcrystalhd/libcrystalhd_if.h check_header libcrystalhd/libcrystalhd_if.h
check_header malloc.h check_header malloc.h

7
libavcodec/dxva2_internal.h
View File

@ -25,7 +25,14 @@
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0600
#define COBJMACROS #define COBJMACROS
#include "config.h"
#include "dxva2.h" #include "dxva2.h"
#if HAVE_DXVA_H
#include <dxva.h>
#endif
#include "avcodec.h" #include "avcodec.h"
#include "mpegvideo.h" #include "mpegvideo.h"