ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Mon Apr 17 10:32:45 2017 +0200| [bb71eb944c7abe4eccb6b21d4771751feca22980] | committer: Clément Bœsch
Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1' * commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1': dxva2: Simplify some ifdefs Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb71eb944c7abe4eccb6b21d4771751feca22980 --- libavcodec/dxva2_internal.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index dfff4d6b47..5df24c5f53 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -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) ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
