Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'

Browse Source 
* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
	libavcodec/dxva2.h

See: 89946c8403
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/88/head
Michael Niedermayer 10 years ago
parent 052cd1ce72 b8962d64cc
commit 38c4316fff
1 changed files with 1 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavcodec/dxva2.h

5
libavcodec/dxva2.h
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save