From: Diego Biurrun Date: Mon, 12 Dec 2016 11:38:06 +0000 (+0100) Subject: dxva2: Keep code shared between dxva2 and d3d11va under the correct #if X-Git-Tag: n3.4~95^2~261 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6aa4ba7131b6e8668e33430e18101a051fe492eb dxva2: Keep code shared between dxva2 and d3d11va under the correct #if This partially reverts commit ac648bb835edd3f67bda2267d0e72e5e582eb5a1. --- diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index e7a9734105..499b37c190 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -32,6 +32,11 @@ #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 @@ -40,9 +45,6 @@ #define _CRT_BUILD_DESKTOP_APP 0 #include #endif -#if CONFIG_D3D11VA -#include "d3d11va.h" -#endif #include "avcodec.h"