diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2021-06-18 06:12:58 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 13:12:58 -0700 |
| commit | 6e024e744e7717c06ddacd5089401109c6298553 (patch) | |
| tree | 9fbe9691488b9869f9c036d96fea97086526904f /versions | |
| parent | a94c58dcdc7ded8d8a1291324876c433769cb348 (diff) | |
| download | vcpkg-6e024e744e7717c06ddacd5089401109c6298553.tar.gz vcpkg-6e024e744e7717c06ddacd5089401109c6298553.zip | |
[ffmpeg] Warn/fail when selecting unsupported features. (#17153)
* [ffmpeg] Warn/fail when selecting unsupported features.
* Update ffmpeg.json
* Bump port-version
* Update ffmpeg.json
* [ffmpeg] Check for gpl/nonfree aswell as all option.
* avisynth now support static linking
* fixup typo
* Update ffmpeg.json
* Revert to fatal error on even when all is selected
* Update ffmpeg.json
* [ffmpeg] Disable openh264 on uwp
* update
* Update versions/f-/ffmpeg.json
* update
* Update ffmpeg.json
* update
* update
* Update
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 1d19fbd84..80fa1b421 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 4 + "port-version": 5 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 3691438cc..a39b1d79a 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94", + "version": "4.4", + "port-version": 5 + }, + { "git-tree": "dfea2c203835c55baec68138cc7e8c65ebcce33a", "version": "4.4", "port-version": 4 |