OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0e6b3f
)
dxva2: Keep code shared between dxva2 and d3d11va under the correct #if
author
Diego Biurrun
<diego@biurrun.de>
Mon, 12 Dec 2016 11:38:06 +0000
(12:38 +0100)
committer
Diego Biurrun
<diego@biurrun.de>
Mon, 12 Dec 2016 12:44:25 +0000
(13:44 +0100)
This partially reverts commit
ac648bb835edd3f67bda2267d0e72e5e582eb5a1
.
libavcodec/dxva2_internal.h
patch
|
blob
|
history
diff --git
a/libavcodec/dxva2_internal.h
b/libavcodec/dxva2_internal.h
index
e7a9734
..
499b37c
100644
(file)
--- 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 <dxva.h>
#endif
-#if CONFIG_D3D11VA
-#include "d3d11va.h"
-#endif
#include "avcodec.h"