aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorMatthias C. M. Troffaes <matthias.troffaes@gmail.com>2021-04-14 21:46:12 +0100
committerGitHub <noreply@github.com>2021-04-14 13:46:12 -0700
commitb1e352c60e706098ac3b5421856ae012eeeb832e (patch)
treecb0cfde4f1c93bb06acca541142601c168673ed4 /versions
parent3639676313a3e8b6fe1e94b9e7917b71d32511e3 (diff)
downloadvcpkg-b1e352c60e706098ac3b5421856ae012eeeb832e.tar.gz
vcpkg-b1e352c60e706098ac3b5421856ae012eeeb832e.zip
[ffmpeg] no longer hardcode version strings in FindFFMPEG script (#17236)
* [ffmpeg] no longer hardcode version strings in FindFFMPEG script * [ffmpeg] bump port version * [ffmpeg] x-add-version * [ffmpeg] use OUTPUT_VARIABLE for extract_version_from_component * [ffmpeg] x-add-version * Apply suggestions from code review * [ffmpeg] fix minor typo * [ffmpeg] fix another minor typo * [ffmpeg] x-add-version 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 1505f651b..5b043cf59 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1942,7 +1942,7 @@
},
"ffmpeg": {
"baseline": "4.3.2",
- "port-version": 2
+ "port-version": 3
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 5f9ff52e6..7ff9ab8d0 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "d70a90e893854dbcb0efbe740f286baf47adafef",
+ "version-string": "4.3.2",
+ "port-version": 3
+ },
+ {
"git-tree": "95a584d785f17bb9158d505bedfda26aa1c52db1",
"version-string": "4.3.2",
"port-version": 2