virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

Browse Source 
This partially reverts commit ac648bb835.
This commit is contained in:
Diego Biurrun
2016-12-12 12:38:06 +01:00
parent b0e6b3f477
commit 6aa4ba7131
1 changed files with 5 additions and 3 deletions
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 #if CONFIG_DXVA2
#include "dxva2.h" #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 /* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h
* defines nothing. Force the struct definitions to be visible. */ * defines nothing. Force the struct definitions to be visible. */
#undef WINAPI_FAMILY #undef WINAPI_FAMILY
@@ -40,9 +45,6 @@
#define _CRT_BUILD_DESKTOP_APP 0 #define _CRT_BUILD_DESKTOP_APP 0
#include <dxva.h> #include <dxva.h>
#endif #endif
#if CONFIG_D3D11VA
#include "d3d11va.h"
#endif
#include "avcodec.h" #include "avcodec.h"