cmake: download architecture-specific ffmpeg for android

2 files changed, 8 insertions, 2 deletions

diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake
index 814069f0b..2e5964cbe 100644
--- a/CMakeModules/DownloadExternals.cmake
+++ b/CMakeModules/DownloadExternals.cmake
@@ -19,7 +19,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 elseif (ANDROID)    
     set(package_base_url "https://gitlab.com/tertius42/")
     set(package_repo "ext-android-bin/-/raw/main/")
-    set(package_extension ".tar.xz") #ffmpeg/ffmpeg-android-20221229.tar.xz")
+    set(package_extension ".tar.xz")
 else()
     message(FATAL_ERROR "No package available for this platform")
 endif()
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 093616629..0a926e399 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -223,7 +223,13 @@ if (NOT WIN32 AND NOT ANDROID)
     endif()
 elseif(ANDROID)
     # Use yuzu FFmpeg binaries
-    set(FFmpeg_EXT_NAME "ffmpeg-android-v4.4.LTS")
+    if (ARCHITECTURE_arm64)
+        set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-aarch64")
+    elseif (ARCHITECTURE_x86_64)
+        set(FFmpeg_EXT_NAME "ffmpeg-android-v5.1.LTS-x86_64")
+    else()
+        message(FATAL_ERROR "Unsupported architecture for Android FFmpeg")
+    endif()
     set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
     download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
     set(FFmpeg_FOUND YES)