Merge commit '9b4b96c0dee90d260891ec765b28f6ca15594340'

* 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>

diff --combined libavcodec/dxva2_internal.h
index d5cc01ef4f770ad0b8944c6f430c85af96707f2b,7155123b5d0c8f64de50a1af1a368ae43020e662..6c9d0bb03f635228c1fdc01717582c81134a640d
--- 1/libavcodec/dxva2_internal.h
--- 2/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@@ -3,20 -3,20 +3,20 @@@
   *
   * copyright (c) 2010 Laurent Aimar
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -36,11 -36,12 +36,13 @@@
  #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