cmake: Update FFmpeg find package to use explicit version

This commit is contained in:
PatTheMav
2023-09-02 17:00:37 +02:00
committed by Ryan Foster
parent 8135085a23
commit 9ae47a7937
2 changed files with 31 additions and 9 deletions
+15 -1
View File
@@ -14,7 +14,21 @@ add_library(libobs SHARED)
add_library(OBS::libobs ALIAS libobs)
find_package(Threads REQUIRED)
find_package(FFmpeg REQUIRED avformat avutil swscale swresample OPTIONAL_COMPONENTS avcodec)
# cmake-format: off
if(OS_WINDOWS OR OS_MACOS)
set(ffmpeg_version 6)
else()
set(ffmpeg_version 5.1)
endif()
find_package(
FFmpeg ${ffmpeg_version}
REQUIRED avformat
avutil
swscale
swresample
OPTIONAL_COMPONENTS avcodec)
# cmake-format: on
find_package(ZLIB REQUIRED)
if(ENABLE_UI)
+16 -8
View File
@@ -5,15 +5,23 @@ legacy_check()
option(ENABLE_FFMPEG_LOGGING "Enables obs-ffmpeg logging" OFF)
option(ENABLE_NEW_MPEGTS_OUTPUT "Use native SRT/RIST mpegts output" ON)
# cmake-format: off
if(OS_WINDOWS OR OS_MACOS)
set(ffmpeg_version 6)
else()
set(ffmpeg_version 5.1)
endif()
find_package(
FFmpeg REQUIRED
COMPONENTS avcodec
avfilter
avdevice
avutil
swscale
avformat
swresample)
FFmpeg ${ffmpeg_version}
REQUIRED avcodec
avfilter
avdevice
avutil
swscale
avformat
swresample)
# cmake-format: on
if(NOT TARGET OBS::media-playback)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/media-playback" "${CMAKE_BINARY_DIR}/deps/media-playback")