Skip to content

[ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] #16882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 6 commits into from
Mar 31, 2021
Merged

[ffmpeg] Fix FindFFMPEG lib versions for building opencv[ffmpeg] #16882

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
331269e
Fix FindFFMPEG lib versions for opencv[ffmpeg]
genevanmeter Mar 25, 2021
97afb68
Modified Port-Version of CONTROL to 13
genevanmeter Mar 26, 2021
37a64ef
Ran vcpkg.exe x-add-version ffmpeg --overwrite-version per Cheney-W's…
genevanmeter Mar 26, 2021
1fd916f
Merged upstream/master
genevanmeter Mar 30, 2021
ebb0374
Updated Port-Version of CONTROL to 1 for FFMPEG version 4.3.2
genevanmeter Mar 30, 2021
1e1dadf
Ran vcpkg x-add-version ffmpeg
genevanmeter Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/ffmpeg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: ffmpeg
Version: 4.3.1
Port-Version: 12
Port-Version: 13
Homepage: https://ffmpeg.org
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
Expand Down
16 changes: 8 additions & 8 deletions ports/ffmpeg/FindFFMPEG.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,28 +287,28 @@ FFMPEG_FIND(libavutil avutil avutil.h)
if (FFMPEG_libavutil_FOUND)
list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
list(REMOVE_DUPLICATES FFMPEG_LIBRARY_DIRS)
set(FFMPEG_libavutil_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libavutil_VERSION "56.51.100" CACHE STRING "")

if(FFMPEG_libavcodec_FOUND)
set(FFMPEG_libavcodec_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libavcodec_VERSION "58.91.100" CACHE STRING "")
endif()
if(FFMPEG_libavdevice_FOUND)
set(FFMPEG_libavdevice_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libavdevice_VERSION "58.10.100" CACHE STRING "")
endif()
if(FFMPEG_libavfilter_FOUND)
set(FFMPEG_libavfilter_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libavfilter_VERSION "7.85.100" CACHE STRING "")
endif()
if(FFMPEG_libavformat_FOUND)
set(FFMPEG_libavformat_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libavformat_VERSION "58.45.100" CACHE STRING "")
endif()
if(FFMPEG_libavresample_FOUND)
set(FFMPEG_libavresample_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libavresample_VERSION "4.0.0" CACHE STRING "")
endif()
if(FFMPEG_libswresample_FOUND)
set(FFMPEG_libswresample_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libswresample_VERSION "3.7.100" CACHE STRING "")
endif()
if(FFMPEG_libswscale_FOUND)
set(FFMPEG_libswscale_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
set(FFMPEG_libswscale_VERSION "5.7.100" CACHE STRING "")
endif()

list(APPEND FFMPEG_LIBRARIES
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1930,7 +1930,7 @@
},
"ffmpeg": {
"baseline": "4.3.1",
"port-version": 12
"port-version": 13
},
"ffnvcodec": {
"baseline": "10.0.26.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "99c8489daeecc76dfc27d2fd6b77b5d5dc5a632f",
"version-string": "4.3.1",
"port-version": 13
},
{
"git-tree": "15e92ca783e70105ccbf4fda0225a2587a760fe9",
"version-string": "4.3.1",
Expand Down