aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromartijn <44672243+omartijn@users.noreply.github.com>2021-03-29 18:42:42 +0200
committerGitHub <noreply@github.com>2021-03-29 09:42:42 -0700
commit38c073dc7a1604362e4bec14252f6a0a7de50e86 (patch)
tree3324196b78fbd23b43fa82d0c112bb5ec9df8674
parent607f143a85c1f54a0b5762eca0170deec59bbaf9 (diff)
downloadvcpkg-38c073dc7a1604362e4bec14252f6a0a7de50e86.tar.gz
vcpkg-38c073dc7a1604362e4bec14252f6a0a7de50e86.zip
Upgrade ffmpeg to 4.3.2 (#16768)
* Upgrade ffmpeg to 4.3.2 * Update version list Co-authored-by: Martijn Otto <git@martijnotto.nl>
-rw-r--r--ports/ffmpeg/CONTROL4
-rw-r--r--ports/ffmpeg/portfile.cmake4
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/f-/ffmpeg.json5
4 files changed, 11 insertions, 6 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index fff2ce9f5..9fb3e5b5f 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,6 +1,6 @@
Source: ffmpeg
-Version: 4.3.1
-Port-Version: 12
+Version: 4.3.2
+Port-Version: 0
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.
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 2e38ee053..469a062ff 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ffmpeg/ffmpeg
- REF n4.3.1
- SHA512 9d533f6db97e8eccb77d78d0b55112ce039580b570d2a98c4204199abe5a4b0f448c44b30048329f6c912579f8ff48385d5100f9e484709b9fd8f4b3935b5031
+ REF n4.3.2
+ SHA512 95e6fdc5980d2940cac33be9015e3acc2e1ce5247ef92211889fcf120add1e6ef01089ca2b8d59c13f91761757ebfe9819dc87a24f690edcafa7e0626f06f64e
HEAD_REF master
PATCHES
0001-create-lib-libraries.patch
diff --git a/versions/baseline.json b/versions/baseline.json
index 4bc4e93e3..a4cb5e6fa 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1929,8 +1929,8 @@
"port-version": 0
},
"ffmpeg": {
- "baseline": "4.3.1",
- "port-version": 12
+ "baseline": "4.3.2",
+ "port-version": 0
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index e22cc861a..5fbf8e4dd 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "fd3c02af90662935ece6ca6ced78f23319b753c9",
+ "version-string": "4.3.2",
+ "port-version": 0
+ },
+ {
"git-tree": "15e92ca783e70105ccbf4fda0225a2587a760fe9",
"version-string": "4.3.1",
"port-version": 12