diff options
| author | Djihad Mahboubi <76681596+Djihads80@users.noreply.github.com> | 2026-11-01 17:25:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-01 17:25:14 +0100 |
| commit | 6957331b913bd50dfab106071e8c7ff4fa662599 (patch) | |
| tree | d4e4aea57d2b0198009576b16aa25fb4394dc176 /externals | |
| parent | fce9c5fd25c66558eb8ed4e9e5ca9129589a5e7d (diff) | |
| parent | 959973a76abaa5444b4b300c37b6d8245ac89396 (diff) | |
Merge pull request #218 from Djihads80/fix/nx2-video-av1
nx2: play AV1 movies (FFmpeg with dav1d on Windows and Linux x86_64)
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index f1bf099c10..890de4303c 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -179,7 +179,13 @@ elseif (MANAGARM) endif() if (YUZU_USE_BUNDLED_FFMPEG) - AddJsonPackage(ffmpeg-ci) + # Windows (MSVC) and Linux x86_64 get the same FFmpeg with libdav1d, for Switch 2 titles' AV1 + # movies; crueter-ci's packages, used elsewhere, have no AV1 decoder. + if ((MSVC OR LINUX) AND CPMUTIL_AMD64) + AddJsonPackage(ffmpeg-ci-av1) + else() + AddJsonPackage(ffmpeg-ci) + endif() set(FFmpeg_INCLUDE_DIR "${FFmpeg_SOURCE_DIR}/include;${FFmpeg_HWACCEL_INCLUDE_DIRS}" |