From 511ecd942efc067813e7814f27da7a701c8f467d Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Wed, 5 May 2021 21:09:30 +0100 Subject: [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 --- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'versions') 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,5 +1,10 @@ { "versions": [ + { + "git-tree": "e497eda37bc7882949022c537489959d12c80f63", + "version-string": "4.3.2", + "port-version": 9 + }, { "git-tree": "297aff4ad5a5110a5cb3cf6a118152722f2239ec", "version-string": "4.3.2", -- cgit v1.2.3