From cddcef650092252a899386b1752f8d762be2dae3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 17 Jun 2024 11:50:20 +0200 Subject: [PATCH] Build: Support building with older ffmpeg precompiled libraries For more convenient bisecting --- build_files/cmake/platform/platform_unix.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 875495520cb..a4c27af5e8c 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -313,15 +313,15 @@ if(WITH_CODEC_FFMPEG) vorbis vorbisenc vorbisfile ogg vpx x264 - x265 ) - if(DEFINED LIBDIR) - if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) - list(APPEND FFMPEG_FIND_COMPONENTS aom) - endif() - if(EXISTS ${LIBDIR}/ffmpeg/lib/libxvidcore.a) - list(APPEND FFMPEG_FIND_COMPONENTS xvidcore) - endif() + if(EXISTS ${LIBDIR}/ffmpeg/lib/libx265.a) + list(APPEND FFMPEG_FIND_COMPONENTS x265) + endif() + if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) + list(APPEND FFMPEG_FIND_COMPONENTS aom) + endif() + if(EXISTS ${LIBDIR}/ffmpeg/lib/libxvidcore.a) + list(APPEND FFMPEG_FIND_COMPONENTS xvidcore) endif() elseif(FFMPEG) # Old cache variable used for root dir, convert to new standard.