diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-17 13:55:50 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-17 13:55:50 +0200 |
| commit | 5eba94a8c392be44a868183cdacff9a38fe55448 (patch) | |
| tree | 0402d9c1ac96982a7665a66d30318fe775ed5740 | |
| parent | f6e8d54fcc17660a8c34512bdc73541664942a5f (diff) | |
| parent | 6aa4ba7131b6e8668e33430e18101a051fe492eb (diff) | |
| download | ffmpeg-5eba94a8c392be44a868183cdacff9a38fe55448.tar.gz | |
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>
| -rw-r--r-- | libavcodec/dxva2_internal.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 5df24c5f53..ac1f77c6a1 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -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" |