diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-09-23 22:46:16 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-23 13:46:16 -0700 |
| commit | 839cdff896114d423bfdb0abc8ffa6bb6d839337 (patch) | |
| tree | 6d0ff2a13ed2eeaa44b0610ee7bfa33a296de97c /ports/ffmpeg/0003-fix-windowsinclude.patch | |
| parent | c7542de3f31defef6344e9acb05adf7d39f6d4a8 (diff) | |
| download | vcpkg-839cdff896114d423bfdb0abc8ffa6bb6d839337.tar.gz vcpkg-839cdff896114d423bfdb0abc8ffa6bb6d839337.zip | |
[ffmpeg] update to 4.2 (#8021)
* [ffmpeg] update to 4.2
* [ffmpeg] add missing dependencies under linux
Diffstat (limited to 'ports/ffmpeg/0003-fix-windowsinclude.patch')
| -rw-r--r-- | ports/ffmpeg/0003-fix-windowsinclude.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/ports/ffmpeg/0003-fix-windowsinclude.patch b/ports/ffmpeg/0003-fix-windowsinclude.patch new file mode 100644 index 000000000..8fe6a5474 --- /dev/null +++ b/ports/ffmpeg/0003-fix-windowsinclude.patch @@ -0,0 +1,28 @@ +diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c +index 9cfbc45..e3447e6 100644 +--- a/fftools/cmdutils.c ++++ b/fftools/cmdutils.c +@@ -63,6 +63,8 @@ + #include <sys/resource.h> + #endif + #ifdef _WIN32 ++#define _WIN32_WINNT 0x0502 ++#define WIN32_LEAN_AND_MEAN + #include <windows.h> + #endif + +diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c +index 01f0410..dbb0736 100644 +--- a/fftools/ffmpeg.c ++++ b/fftools/ffmpeg.c +@@ -23,6 +23,10 @@ + * multimedia converter based on the FFmpeg libraries + */ + ++#define _WIN32_WINNT 0x0502 // Must be less than 0x0600, because otherwise WinSock2.h defines "pollfd" which then gets redefined in "os_support.h". ++#define WIN32_LEAN_AND_MEAN ++ ++ + #include "config.h" + #include <ctype.h> + #include <string.h> |