From 9b9276e7524523d7f667fefcd0694d981443df0e Mon Sep 17 00:00:00 2001 From: 21pages Date: Mon, 22 Sep 2025 17:02:53 +0800 Subject: [PATCH] fix crash on android armv7 (#12997) Signed-off-by: 21pages --- res/vcpkg/ffmpeg/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/res/vcpkg/ffmpeg/portfile.cmake b/res/vcpkg/ffmpeg/portfile.cmake index 0b6f3ad7e..21842b6af 100644 --- a/res/vcpkg/ffmpeg/portfile.cmake +++ b/res/vcpkg/ffmpeg/portfile.cmake @@ -185,6 +185,11 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") --enable-decoder=h264_mediacodec \ --enable-decoder=hevc_mediacodec \ ") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + string(APPEND OPTIONS "\ +--disable-iconv \ +") + endif() endif() if(VCPKG_TARGET_IS_OSX)