diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-12-08 09:55:26 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-12-11 09:27:40 +0100 |
| commit | ac648bb835edd3f67bda2267d0e72e5e582eb5a1 (patch) | |
| tree | 4a045034bb9f807b7e3495a238577760ad52cad3 /libavcodec/dxva2_internal.h | |
| parent | 7d81698b89172d2dcf1b78d4b42ba86262360559 (diff) | |
| download | ffmpeg-ac648bb835edd3f67bda2267d0e72e5e582eb5a1.tar.gz | |
dxva2: Simplify some ifdefs
Diffstat (limited to 'libavcodec/dxva2_internal.h')
| -rw-r--r-- | libavcodec/dxva2_internal.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 2d7939e7c1..e7a9734105 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -32,11 +32,6 @@ #if CONFIG_DXVA2 #include "dxva2.h" -#endif -#if CONFIG_D3D11VA -#include "d3d11va.h" -#endif -#if HAVE_DXVA_H /* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h * defines nothing. Force the struct definitions to be visible. */ #undef WINAPI_FAMILY @@ -45,6 +40,9 @@ #define _CRT_BUILD_DESKTOP_APP 0 #include <dxva.h> #endif +#if CONFIG_D3D11VA +#include "d3d11va.h" +#endif #include "avcodec.h" @@ -59,12 +57,8 @@ typedef union { #endif } AVDXVAContext; -#if CONFIG_D3D11VA #define D3D11VA_CONTEXT(ctx) (&ctx->d3d11va) -#endif -#if CONFIG_DXVA2 #define DXVA2_CONTEXT(ctx) (&ctx->dxva2) -#endif #if CONFIG_D3D11VA && CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.workaround : ctx->dxva2.workaround) |