From 5d54adbf61be7b0c87bcf6dcc1e2f8a8cc94b22d Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 22 Apr 2026 08:53:12 +0000 Subject: [PATCH] [externals] update ffmpeg to d1d873c003 Signed-off-by: lizzie --- externals/cpmfile.json | 4 ++-- externals/ffmpeg/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index b8472774ae..df03cde892 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -222,8 +222,8 @@ }, "ffmpeg": { "repo": "FFmpeg/FFmpeg", - "sha": "c7b5f1537d", - "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a", + "sha": "d1d873c003", + "hash": "eb2cd44f53b992ff0124507d7fda173a6b132dc1456d3761cdef4b4afb54b3850c38cdfc62abd460fdf76e25fc4c55a9d4f5b04463e3e1cd3ced71b9b0e13914", "bundled": true }, "ffmpeg-ci": { diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 3140f8e545..0ad62d6620 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -244,7 +244,7 @@ else() set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES}) # BSD make or Solaris make don't support ffmpeg make-j8 - if (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD) + if (DEFINED SYSTEM_THREADS AND (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD)) set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS}) else() set(FFmpeg_MAKE_ARGS "")