aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorMatthias C. M. Troffaes <matthias.troffaes@gmail.com>2021-05-05 21:09:30 +0100
committerGitHub <noreply@github.com>2021-05-05 13:09:30 -0700
commit511ecd942efc067813e7814f27da7a701c8f467d (patch)
tree3948717f2e730a78002b1fbbe709f903c91e05f0 /versions
parente8dbfcf6797a270ed5be8550248f7fe4fe5dec79 (diff)
downloadvcpkg-511ecd942efc067813e7814f27da7a701c8f467d.tar.gz
vcpkg-511ecd942efc067813e7814f27da7a701c8f467d.zip
[ffmpeg] fix dnn dependency (#17659)
* [ffmpeg] fix dnn dependency The source file "libavfilter/dnn/dnn_backend_native.h" includes "libavformat/avio.h", so avformat needs to be declared as a dependency. This fixes the build of ffmpeg[core,avfilter]:x64-windows. Posted upstream here: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html Whilst at it, I've also added a link to the other avfilter patch: http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279927.html * [ffmpeg] version bump * [ffmpeg] x-add-version * [openimageio] revert accidentally committed change that is meant for other PR
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 036d9aa38..b5903374c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1954,7 +1954,7 @@
},
"ffmpeg": {
"baseline": "4.3.2",
- "port-version": 8
+ "port-version": 9
},
"ffnvcodec": {
"baseline": "10.0.26.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 530ab8ec1..d54ab1f5d 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "e497eda37bc7882949022c537489959d12c80f63",
+ "version-string": "4.3.2",
+ "port-version": 9
+ },
+ {
"git-tree": "297aff4ad5a5110a5cb3cf6a118152722f2239ec",
"version-string": "4.3.2",
"port-version": 8