videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb' 

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

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-04-17 13:55:50 +02:00
parent f6e8d54fcc 6aa4ba7131
commit 5eba94a8c3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dxva2_internal.h
View File

@ -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"