[FFmpeg-cvslog] dxva2: Prevent redefinition of _WIN32_WINNT
James Almer
git at videolan.org
Fri Feb 8 14:16:33 CET 2013
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Feb 8 01:17:06 2013 -0300| [89946c8403752fbb26234d98f780188df8951a2e] | committer: Michael Niedermayer
dxva2: Prevent redefinition of _WIN32_WINNT
Don't redefine _WIN32_WINNT when targeting Win7/8
Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89946c8403752fbb26234d98f780188df8951a2e
---
libavcodec/dxva2_internal.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index fcf45bc..03f7f5d 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -23,7 +23,14 @@
#ifndef AVCODEC_DXVA_INTERNAL_H
#define AVCODEC_DXVA_INTERNAL_H
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
+#undef _WIN32_WINNT
+#endif
+
+#if !defined(_WIN32_WINNT)
#define _WIN32_WINNT 0x0600
+#endif
+
#define COBJMACROS
#include "config.h"
More information about the ffmpeg-cvslog
mailing list