xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 05:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'

Browse Source 
* commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1':
  dxva2: Simplify some ifdefs

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-04-17 10:32:45 +02:00
commit bb71eb944c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/dxva2_internal.h
View File

@ -32,12 +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
@ -46,6 +40,9 @@
#define _CRT_BUILD_DESKTOP_APP 0
#include <dxva.h>
#endif
#if CONFIG_D3D11VA
#include "d3d11va.h"
#endif
#include "avcodec.h"
@ -60,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)