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/fix_windowsinclude-in-ffmpegexe-2.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/fix_windowsinclude-in-ffmpegexe-2.patch')
| -rw-r--r-- | ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch deleted file mode 100644 index 69d725e2a..000000000 --- a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/fftools/ffmpeg.c 2017-07-29 19:49:29.000000000 +0200 -+++ b/fftools/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> |