Merge commit '86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81'

[ffmpeg] / libavcodec / dxva2_internal.h

diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index dfff4d6b47f0300f9338ed85a659351ba4b6d447..ac1f77c6a120d2c464d951bb8993a2cc1d77b309 100644 (file)
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -36,7 +36,6 @@
 #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. */
@@ -60,12 +59,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)