[FFmpeg-cvslog] Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr 17 13:55:50 2017 +0200| [5eba94a8c392be44a868183cdacff9a38fe55448] | committer: Clément Bœsch

Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'

* commit '6aa4ba7131b6e8668e33430e18101a051fe492eb':
  dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eba94a8c392be44a868183cdacff9a38fe55448
---

 libavcodec/dxva2_internal.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index 5df24c5f53..ac1f77c6a1 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 <dxva.h>
 #endif
-#if CONFIG_D3D11VA
-#include "d3d11va.h"
-#endif
 
 #include "avcodec.h"
 


======================================================================