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

[James Almer]

On 07/02/13 10:51 PM, Michael Niedermayer wrote:
> On Sun, Feb 03, 2013 at 06:18:41AM -0300, James Almer wrote:
>> Don't redefine _WIN32_WINNT when targeting Win7/8.
>> Also, undef it first to avoid a redefine warning.
>>
>> Signed-off-by: James Almer <jamrial at gmail.com>
>> ---
>>  libavcodec/dxva2_internal.h | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
>> index fcf45bc..90b5773 100644
>> --- a/libavcodec/dxva2_internal.h
>> +++ b/libavcodec/dxva2_internal.h
>> @@ -23,7 +23,11 @@
>>  #ifndef AVCODEC_DXVA_INTERNAL_H
>>  #define AVCODEC_DXVA_INTERNAL_H
>>  
>> +#if (_WIN32_WINNT < 0x0600)
> 
> is _WIN32_WINNT guranteed to be defined here at all ?
> if not then this needs an additional check

You're right, it's not defined with some toolchains.
Will send a new patch with an extra check in a moment.

Regards.