build: Add proper detection of new FFmpeg versions (AcademySoftwareFo…

…undation#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]> Signed-off-by: Zach Lewis <[email protected]>
zachlewis · Sep 16, 2024 · 14f7bb0 · 14f7bb0
1 parent d8ad61f
commit 14f7bb0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/cmake/modules/FindFFmpeg.cmake b/src/cmake/modules/FindFFmpeg.cmake
@@ -73,7 +73,11 @@ if (FFMPEG_INCLUDES)
        REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
   string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO "${TMP}")
   set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
-  if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 60.3.100)
+  if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 61.3.100)
+      set (FFMPEG_VERSION 7.0)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 60.31.102)
+      set (FFMPEG_VERSION 6.1)
+  elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 60.3.100)
       set (FFMPEG_VERSION 6.0)
   elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.37.100)
       set (FFMPEG_VERSION 5.1)