aboutsummaryrefslogtreecommitdiff
path: root/versions/f-/ffmpeg.json
diff options
context:
space:
mode:
authorgenevanmeter <47541158+genevanmeter@users.noreply.github.com>2021-03-31 13:20:17 -0400
committerGitHub <noreply@github.com>2021-03-31 10:20:17 -0700
commitdb1df24767ae50fdcd8229bc4ae37c672e2b3e53 (patch)
tree65eaf9095e91271378fd8afe6553a94e7aee787f /versions/f-/ffmpeg.json
parented54efbb16ae8a457296c7a7e1462a9f54571e94 (diff)
downloadvcpkg-db1df24767ae50fdcd8229bc4ae37c672e2b3e53.tar.gz
vcpkg-db1df24767ae50fdcd8229bc4ae37c672e2b3e53.zip
[ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] (#16882)
* Fix FindFFMPEG lib versions for opencv[ffmpeg] libavutil, libavdevice, etc. define their versions separate from FFMPEG main version in a version.h file located with each component headers. This change fixes building opencv[ffmpeg] when it attempts to discover the individual versions of FFMPEG libs. Before this change opencv[ffmpeg] would build but the FFMPEG functionality was disabled since all the lib versions were set to 4.3.1 * Modified Port-Version of CONTROL to 13 Ran vcpkg.exe x-add-version ffmpeg * Ran vcpkg.exe x-add-version ffmpeg --overwrite-version per Cheney-W's instructions * Updated Port-Version of CONTROL to 1 for FFMPEG version 4.3.2 * Ran vcpkg x-add-version ffmpeg
Diffstat (limited to 'versions/f-/ffmpeg.json')
-rw-r--r--versions/f-/ffmpeg.json5
1 files changed, 5 insertions, 0 deletions
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 5fbf8e4dd..42b7421a3 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8d581e93ca7ee374d63bae07dff49356c79dee8c",
+ "version-string": "4.3.2",
+ "port-version": 1
+ },
+ {
"git-tree": "fd3c02af90662935ece6ca6ced78f23319b753c9",
"version-string": "4.3.2",
"port-version": 0