Skip to content

Commit 2c00908

Browse files
darbyjohnstonlgritz
authored andcommitted
build: Add proper detection of new FFmpeg versions (#4394)
Correctly detect new versions of FFmpeg (6.1 and 7.0). The FFmpeg versions page was used for reference: https://www.ffmpeg.org/download.html#releases Signed-off-by: Darby Johnston <[email protected]>
1 parent 1a922ab commit 2c00908

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/cmake/modules/FindFFmpeg.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ if (FFMPEG_INCLUDES)
7373
REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
7474
string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO "${TMP}")
7575
set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
76-
if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 60.3.100)
76+
if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 61.3.100)
77+
set (FFMPEG_VERSION 7.0)
78+
elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 60.31.102)
79+
set (FFMPEG_VERSION 6.1)
80+
elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 60.3.100)
7781
set (FFMPEG_VERSION 6.0)
7882
elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.37.100)
7983
set (FFMPEG_VERSION 5.1)

0 commit comments

Comments
 (0)