Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 20:41:18 +0000 (22:41 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 20:41:18 +0000 (22:41 +0200)
* commit '9b4b96c0dee90d260891ec765b28f6ca15594340':
  force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

Conflicts:
libavcodec/dxva2_internal.h

See: c5327df838396e7c43a56bdd141c0f01ba3edc94
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavcodec/dxva2_internal.h

  #if CONFIG_D3D11VA
  #include "d3d11va.h"
  #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