diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
|---|---|---|
| committer | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
| commit | 34d19da9ffd0571bf16190ec4a16a04bef265900 (patch) | |
| tree | 413690269c5f216194b9a0f72f0438b27ccfd68d /ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch | |
| parent | b395438c791ca9f78e383a1d571525eee785e67c (diff) | |
| parent | 59a8a9c6248ed230b19028a44484ae5f06db697d (diff) | |
| download | vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.tar.gz vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch')
| -rw-r--r-- | ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch index fc63f1486..69d725e2a 100644 --- a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch +++ b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch @@ -1,5 +1,5 @@ ---- a/ffmpeg.c 2017-07-29 19:49:29.000000000 +0200 -+++ b/ffmpeg.c 2018-09-02 20:32:27.666725200 +0200 +--- 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 */ |