ffmpeg | branch: master | Diego Biurrun <di...@biurrun.de> | Fri Aug 15 21:01:15 2014 +0200| [b8962d64cc71af241601bcab5c3fcdc5735ef4ae] | committer: Diego Biurrun
dxva2: Clean up definition of _WIN32_WINNT Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is cleaner than unconditional definition and avoids a number of redefinition warnings. Also only define a value in one of the two dxva2 headers. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8962d64cc71af241601bcab5c3fcdc5735ef4ae --- libavcodec/dxva2.h | 4 ++++ libavcodec/dxva2_internal.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index 78939be..d9017c6 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -29,7 +29,11 @@ * Public libavcodec DXVA2 header. */ +#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 +#undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 +#endif + #include <stdint.h> #include <d3d9.h> #include <dxva2api.h> diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index f35a076..b775e6c 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_DXVA_INTERNAL_H #define AVCODEC_DXVA_INTERNAL_H -#define _WIN32_WINNT 0x0600 #define COBJMACROS #include "config.h" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
