aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorMartin Vejdarski <extrulm@gmail.com>2021-06-03 23:56:43 +0200
committerGitHub <noreply@github.com>2021-06-03 14:56:43 -0700
commitc4fedf081dcd0931e2aaab5ab1afa21e31a94e6d (patch)
tree450871f29fb2cbfe2dd11497adff92a3c0dd9aae /versions
parent04b6a4b9272ea7e52f963648e2575c116fe177aa (diff)
downloadvcpkg-c4fedf081dcd0931e2aaab5ab1afa21e31a94e6d.tar.gz
vcpkg-c4fedf081dcd0931e2aaab5ab1afa21e31a94e6d.zip
[ffmpeg] Add support for arm64 on macOS (#18182)
* [FFmpeg] Add support for arm64 on macOS * [ffmpeg] x-add-version * [ffmpeg] Rename version-string to version * [ffmpeg] x-add-version * minor fixes Co-authored-by: nicole mazzuca <mazzucan@outlook.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 1c2e036a8..01a7eb9a7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1978,7 +1978,7 @@
},
"ffmpeg": {
"baseline": "4.4",
- "port-version": 1
+ "port-version": 2
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 4b613ade2..535f83e55 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "998009397c4df3ca2b7d2451c9ec43c817fdc6c7",
+ "version": "4.4",
+ "port-version": 2
+ },
+ {
"git-tree": "5ae25637fccfc24bbaf8ab7fbf735191952595fd",
"version-string": "4.4",
"port-version": 1