diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-03-09 09:19:05 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-03-09 09:19:05 -0700 |
| commit | 6b55c62144b120f3c5fc0d3cd8163f309241a18a (patch) | |
| tree | 125aa435dff79db545fc4b08ab0c3cb537bc725c /ports/ffmpeg | |
| parent | e21400c7cae2c2df3a9dce6ef8e3c4bf7109aaac (diff) | |
| parent | d0b1f2a9e8ed1ea53d181d13c69e15cf775148db (diff) | |
| download | vcpkg-6b55c62144b120f3c5fc0d3cd8163f309241a18a.tar.gz vcpkg-6b55c62144b120f3c5fc0d3cd8163f309241a18a.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index fee79a66a..769995497 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-4 +Version: 4.2-5 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 1562fff05..bb4706985 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -51,7 +51,7 @@ endif() # Platform dependent libraries required by FFMPEG if(WIN32) if(NOT CYGWIN) - list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 Secur32 bcrypt) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 secur32 bcrypt) endif() else() list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS m) |