diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 20:42:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 20:45:50 +0200 |
| commit | 38c4316fff74ce51752ddb3722df619ecd2e8de6 (patch) | |
| tree | 151d7aeb7ab48007aa2da913fdad2740b8ac3e4c | |
| parent | 052cd1ce720406918181c00418609fc6c8697e3a (diff) | |
| parent | b8962d64cc71af241601bcab5c3fcdc5735ef4ae (diff) | |
| download | ffmpeg-38c4316fff74ce51752ddb3722df619ecd2e8de6.tar.gz | |
Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
dxva2: Clean up definition of _WIN32_WINNT
Conflicts:
libavcodec/dxva2.h
See: 89946c8403752fbb26234d98f780188df8951a2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dxva2.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index 2639d89d90..be246d7198 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -29,11 +29,8 @@ * Public libavcodec DXVA2 header. */ -#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600 +#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 #undef _WIN32_WINNT -#endif - -#if !defined(_WIN32_WINNT) #define _WIN32_WINNT 0x0600 #endif |