git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d81698
)
dxva2: Simplify some ifdefs
author
Diego Biurrun
<diego@biurrun.de>
Thu, 8 Dec 2016 08:55:26 +0000
(09:55 +0100)
committer
Diego Biurrun
<diego@biurrun.de>
Sun, 11 Dec 2016 08:27:40 +0000
(09:27 +0100)
libavcodec/dxva2_internal.h
patch
|
blob
|
history
diff --git
a/libavcodec/dxva2_internal.h
b/libavcodec/dxva2_internal.h
index
2d7939e
..
e7a9734
100644
(file)
--- a/
libavcodec/dxva2_internal.h
+++ b/
libavcodec/dxva2_internal.h
@@
-32,11
+32,6
@@
#if CONFIG_DXVA2
#include "dxva2.h"
#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
/* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h
* defines nothing. Force the struct definitions to be visible. */
#undef WINAPI_FAMILY
@@
-45,6
+40,9
@@
#define _CRT_BUILD_DESKTOP_APP 0
#include <dxva.h>
#endif
#define _CRT_BUILD_DESKTOP_APP 0
#include <dxva.h>
#endif
+#if CONFIG_D3D11VA
+#include "d3d11va.h"
+#endif
#include "avcodec.h"
#include "avcodec.h"
@@
-59,12
+57,8
@@
typedef union {
#endif
} AVDXVAContext;
#endif
} 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
#define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.workaround : ctx->dxva2.workaround)
#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)