Skip to content

F
ffmpeg
Commit 6aa4ba71 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

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

This partially reverts commit ac648bb8.
parent b0e6b3f4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
libavcodec/dxva2_internal.h
View file @ 6aa4ba71
...@@ -32,6 +32,11 @@ ...@@ -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 @@ ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment