Skip to content

F
ffmpeg.wasm-core
Commit ac648bb8 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

dxva2: Simplify some ifdefs

parent 7d81698b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
libavcodec/dxva2_internal.h
View file @ ac648bb8
...@@ -32,11 +32,6 @@ ...@@ -32,11 +32,6 @@
#if CONFIG_DXVA2 #if CONFIG_DXVA2
#include "dxva2.h" #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 /* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h
* defines nothing. Force the struct definitions to be visible. */ * defines nothing. Force the struct definitions to be visible. */
#undef WINAPI_FAMILY #undef WINAPI_FAMILY
...@@ -45,6 +40,9 @@ ...@@ -45,6 +40,9 @@
#define _CRT_BUILD_DESKTOP_APP 0 #define _CRT_BUILD_DESKTOP_APP 0
#include <dxva.h> #include <dxva.h>
#endif #endif
#if CONFIG_D3D11VA
#include "d3d11va.h"
#endif
#include "avcodec.h" #include "avcodec.h"
...@@ -59,12 +57,8 @@ typedef union { ...@@ -59,12 +57,8 @@ typedef union {
#endif #endif
} AVDXVAContext; } AVDXVAContext;
#if CONFIG_D3D11VA
#define D3D11VA_CONTEXT(ctx) (&ctx->d3d11va) #define D3D11VA_CONTEXT(ctx) (&ctx->d3d11va)
#endif
#if CONFIG_DXVA2
#define DXVA2_CONTEXT(ctx) (&ctx->dxva2) #define DXVA2_CONTEXT(ctx) (&ctx->dxva2)
#endif
#if CONFIG_D3D11VA && CONFIG_DXVA2 #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) #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.workaround : ctx->dxva2.workaround)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment