diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2021-01-28 02:29:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 18:29:58 -0800 |
| commit | 3c466eb80c705ec42dbb278351e2ef2f5253b622 (patch) | |
| tree | f3fcd955ab379aa10bf9aaf3325eade540ee6aab /versions | |
| parent | d2cc90fe9c27e02ca1008ebc34a806ea64399727 (diff) | |
| download | vcpkg-3c466eb80c705ec42dbb278351e2ef2f5253b622.tar.gz vcpkg-3c466eb80c705ec42dbb278351e2ef2f5253b622.zip | |
[ffmpeg] use nasm instead of yasm (#14547)
* [ffmpeg] use nasm instead of yasm
* [ffmpeg] bump port version
* [ffmpeg] remove old yasm path reference
* update baseline
* [ffmpeg] fall back to yasm on x86
* [ffmpeg] add comment in portfile about issue with ffmpeg nasm build for future reference
* [ffmpeg] update git-tree
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.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 bad41c178..ef7e997e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1878,7 +1878,7 @@ }, "ffmpeg": { "baseline": "4.3.1", - "port-version": 9 + "port-version": 10 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a9bdb56b9..a2ddd9b00 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "93395ca1a700faa1c8c6ce04ef4a6dfa26e9fade", + "version-string": "4.3.1", + "port-version": 10 + }, + { "git-tree": "f591a51746536b99b4621d39ea7e0dcd8a693016", "version-string": "4.3.1", "port-version": 9 |