Merge commit '9b4b96c0'

* commit '9b4b96c0':
  force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

Conflicts:
	libavcodec/dxva2_internal.h

See: c5327df8Merged-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/dxva2_internal.h

@@ -38,9 +38,11 @@
 #endif
 
 #if HAVE_DXVA_H
-/* dxva.h defines nothing otherwise but it works */
+/* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h
+ * defines nothing. Force the struct definitions to be visible. */
 #undef WINAPI_FAMILY
 #define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
+#undef _CRT_BUILD_DESKTOP_APP
 #define _CRT_BUILD_DESKTOP_APP 0
 #include <dxva.h>
 #endif