From f91b6fbbcb56870f912540550c9517800c152a46 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 10 Dec 2021 21:26:43 -0700 Subject: ffmpeg: move the whole tree into externals/ffmpeg/ffmpeg ... * this resolves the todo items in the CMakeLists.txt * a version requirement check for ffmpeg is added to catch issues early * for future-proof reasons, nasm/yasm is now only required when build on x86/AMD64 systems --- externals/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 64d1e6aec..bbbe6667d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -121,3 +121,8 @@ if (NOT opus_FOUND) message(STATUS "opus 1.3 or newer not found, falling back to externals") add_subdirectory(opus EXCLUDE_FROM_ALL) endif() + +# FFMpeg +if (YUZU_USE_BUNDLED_FFMPEG) + add_subdirectory(ffmpeg) +endif() -- cgit v1.2.3