aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorAlexandre Bique <bique.alexandre@gmail.com>2021-07-28 00:48:31 +0200
committerGitHub <noreply@github.com>2021-07-27 15:48:31 -0700
commitdb4d9760aaebc8445308c8d3a425cc01bb47c459 (patch)
treea768ca2bbc8c5136a9b12a3fb72be029763f2443 /versions
parent9f8a74d7c2cc41664d76ea30b49063554acb03b8 (diff)
downloadvcpkg-db4d9760aaebc8445308c8d3a425cc01bb47c459.tar.gz
vcpkg-db4d9760aaebc8445308c8d3a425cc01bb47c459.zip
[ffmpeg] fix cross compilation on mac arm64 to x86_64 (#18737)
* [ffmpeg] fix cross compilation on mac arm64 to x86_64 * Bump port-version * Bump port-version again. Co-authored-by: Billy Robert ONeal III <bion@microsoft.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 e9f6f6ec4..5ccb76584 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1998,7 +1998,7 @@
},
"ffmpeg": {
"baseline": "4.4",
- "port-version": 10
+ "port-version": 11
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 95b846ba5..0897dd09b 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1",
+ "version": "4.4",
+ "port-version": 11
+ },
+ {
"git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9",
"version": "4.4",
"port-version": 10