aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authoromartijn <44672243+omartijn@users.noreply.github.com>2021-10-06 20:06:35 +0200
committerGitHub <noreply@github.com>2021-10-06 11:06:35 -0700
commitd6245fc7d991979c84370b33ef408ffe4a3442da (patch)
treede1b2e8111c3d68d0c0738b2c37b45bb14094362 /versions
parentff5afbab34834eaf1aebba808c47fea4fd606276 (diff)
downloadvcpkg-d6245fc7d991979c84370b33ef408ffe4a3442da.tar.gz
vcpkg-d6245fc7d991979c84370b33ef408ffe4a3442da.zip
[ffmpeg] Honor macosx deployment target for ffmpeg (#18460)
* Honor macosx deployment target for ffmpeg * fixup! Honor macosx deployment target for ffmpeg Co-authored-by: Martijn Otto <git@martijnotto.nl> Co-authored-by: Martijn Otto <martijn@resolume.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/ffmpeg.json5
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 3aa7be4c8..ba8c37dbe 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2102,7 +2102,7 @@
},
"ffmpeg": {
"baseline": "4.4",
- "port-version": 14
+ "port-version": 15
},
"ffnvcodec": {
"baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 4fb6cbd41..35a46648b 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "24cb6ddcd146248cb3758ec1aa4c038b28d4c0c5",
+ "version": "4.4",
+ "port-version": 15
+ },
+ {
"git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76",
"version": "4.4",
"port-version": 14