Browse Source

dxva2: include dxva.h if found

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>
tags/n1.0
Ronald S. Bultje Martin Storsjö 13 years ago
parent
commit
fa84506177
2 changed files with 9 additions and 0 deletions
  1. +2
    -0
      configure
  2. +7
    -0
      libavcodec/dxva2_internal.h

+ 2
- 0
configure View File

@@ -1071,6 +1071,7 @@ HAVE_LIST="
dlfcn_h
dlopen
dos_paths
dxva_h
ebp_available
ebx_available
exp2
@@ -2870,6 +2871,7 @@ check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc

check_header dlfcn.h
check_header dxva.h
check_header dxva2api.h
check_header malloc.h
check_header poll.h


+ 7
- 0
libavcodec/dxva2_internal.h View File

@@ -25,7 +25,14 @@

#define _WIN32_WINNT 0x0600
#define COBJMACROS

#include "config.h"

#include "dxva2.h"
#if HAVE_DXVA_H
#include <dxva.h>
#endif

#include "avcodec.h"
#include "mpegvideo.h"



Loading…
Cancel
Save