diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 03:13:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 03:13:34 -0700 |
| commit | 637963244b5442d41f876b41f2622654e88f3074 (patch) | |
| tree | dbdc23ac9301748e06911a9d3fff05cd507b9121 /ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch | |
| parent | 7f02290c438845098b2b843152bd3bea96081af0 (diff) | |
| parent | 0e000644053015b7f7a0985e14f0bd384c847d17 (diff) | |
| download | vcpkg-637963244b5442d41f876b41f2622654e88f3074.tar.gz vcpkg-637963244b5442d41f876b41f2622654e88f3074.zip | |
Merge pull request #4217 from ptahmose/master
[ffmpeg] Add feature to build "ffmpeg.exe"
Diffstat (limited to 'ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch')
| -rw-r--r-- | ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch new file mode 100644 index 000000000..fc63f1486 --- /dev/null +++ b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch @@ -0,0 +1,14 @@ +--- a/ffmpeg.c 2017-07-29 19:49:29.000000000 +0200 ++++ b/ffmpeg.c 2018-09-02 20:32:27.666725200 +0200 +@@ -23,6 +23,11 @@ + * 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". ++ // I suppose that "HAVE_STRUCT_POLLFD" should be 1, but it happens to be 0. Sorry, this is somewhat beyond me. ++#define WIN32_LEAN_AND_MEAN ++ ++ + #include "config.h" + #include <ctype.h> + #include <string.h> |