diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-18 15:22:05 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-18 15:22:05 -0800 |
| commit | 3cd8d3e85696fba0c0962d07c9f3486c62dcafe8 (patch) | |
| tree | 26103826af2b25268fd4cc2f86b32718e77f0760 /ports/ffmpeg | |
| parent | bc79cf9a7c39067fcbd7765ec8129b232cb35da4 (diff) | |
| parent | d2b0798854c16d8644e3ba2f69ffd3baa448f4ec (diff) | |
| download | vcpkg-3cd8d3e85696fba0c0962d07c9f3486c62dcafe8.tar.gz vcpkg-3cd8d3e85696fba0c0962d07c9f3486c62dcafe8.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4951
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 7688f67f9..35b3e257e 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 3.3.3-5 +Version: 4.1 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations. diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 994e057b3..f8c0c9f38 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,9 +1,9 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-3.3.3) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-4.1) vcpkg_download_distfile(ARCHIVE - URLS "http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.bz2" - FILENAME "ffmpeg-3.3.3.tar.bz2" - SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab + URLS "http://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2" + FILENAME "ffmpeg-4.1.tar.bz2" + SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417 ) if (${SOURCE_PATH} MATCHES " ") @@ -59,12 +59,6 @@ else() set(OPTIONS "${OPTIONS} --disable-ffplay") endif() -if("ffserver" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} --enable-ffserver") -else() - set(OPTIONS "${OPTIONS} --disable-ffserver") -endif() - if("ffprobe" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-ffprobe") else() |