aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorMatthias C. M. Troffaes <matthias.troffaes@gmail.com>2021-05-18 07:18:50 +0100
committerGitHub <noreply@github.com>2021-05-17 23:18:50 -0700
commit44e8841e065a1b14340c6c0bb90210b11d7c3d4d (patch)
tree4564ef85b13f0cf6619f83d314dad5aa5359dbf1 /versions
parentc76ec6f7f719ba2c35ed6f1155c0ae65875c867c (diff)
downloadvcpkg-44e8841e065a1b14340c6c0bb90210b11d7c3d4d.tar.gz
vcpkg-44e8841e065a1b14340c6c0bb90210b11d7c3d4d.zip
[ffmpeg] update to upstream version 4.4 (#17735)
* [ffmpeg] update to version 4.4 * [ffmpeg] format-manifest * [ffmpeg] remove avresample as default feature (it is deprecated, not upstream default, and will be removed in 4.5) * [ffmpeg] x-add-version * [ffmpeg] add avresample under the all feature * [ffmpeg] x-add-version * [ffmpeg] remove unused patch * [ffmpeg] x-add-version * [ffmpeg] remove wavpack from FindFFMPEG * [ffmpeg] x-add-version * [ffmpeg] fix compile cuda issue * [ffmpeg] x-add-version * [ffmpeg] only apply cuda compile patch on windows targets * [ffmpeg] x-add-version
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/f-/ffmpeg.json5
2 files changed, 7 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index f5918e86d..a8add12b0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1957,8 +1957,8 @@
"port-version": 0
},
"ffmpeg": {
- "baseline": "4.3.2",
- "port-version": 11
+ "baseline": "4.4",
+ "port-version": 0
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 250729edb..86de96856 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "648aee5015e8d511d44854e1056e4288683935cc",
+ "version-string": "4.4",
+ "port-version": 0
+ },
+ {
"git-tree": "fe496d461929767f020d5d9e577408ed298febcc",
"version-string": "4.3.2",
"port-version": 11