[FFmpeg-devel] [PATCH] dxva2: Prevent redefinition of _WIN32_WINNT

[compn]

On Fri,  8 Feb 2013 01:17:06 -0300, James Almer wrote:
>Don't redefine _WIN32_WINNT when targeting Win7/8
>+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
>+#undef _WIN32_WINNT
>+#endif
>+
>+#if !defined(_WIN32_WINNT)
> #define _WIN32_WINNT 0x0600
>+#endif
>+

i think you can merge these?

-compn