mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-30 16:42:13 +02:00
Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
dxva2: Clean up definition of _WIN32_WINNT
Conflicts:
libavcodec/dxva2.h
See: 89946c8403
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
38c4316fff
@ -29,11 +29,8 @@
|
|||||||
* Public libavcodec DXVA2 header.
|
* Public libavcodec DXVA2 header.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
|
#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
|
||||||
#undef _WIN32_WINNT
|
#undef _WIN32_WINNT
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(_WIN32_WINNT)
|
|
||||||
#define _WIN32_WINNT 0x0600
|
#define _WIN32_WINNT 0x0600
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user