diff --git a/res/vcpkg/ffmpeg/portfile.cmake b/res/vcpkg/ffmpeg/portfile.cmake index 21842b6af..3fe5c70c9 100644 --- a/res/vcpkg/ffmpeg/portfile.cmake +++ b/res/vcpkg/ffmpeg/portfile.cmake @@ -177,6 +177,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") string(APPEND OPTIONS "\ --target-os=android \ --disable-asm \ +--disable-iconv \ --enable-jni \ --enable-mediacodec \ --disable-hwaccels \ @@ -185,11 +186,6 @@ 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)