ffmpeg | branch: master | Diego Biurrun <di...@biurrun.de> | Mon Dec 12 12:38:06 2016 +0100| [6aa4ba7131b6e8668e33430e18101a051fe492eb] | committer: Diego Biurrun
dxva2: Keep code shared between dxva2 and d3d11va under the correct #if This partially reverts commit ac648bb835edd3f67bda2267d0e72e5e582eb5a1. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6aa4ba7131b6e8668e33430e18101a051fe492eb --- libavcodec/dxva2_internal.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index e7a9734105..499b37c190 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" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
