summaryrefslogtreecommitdiff
path: root/externals/ffmpeg
diff options
context:
space:
mode:
authorViktor Szépe <viktor@szepe.net>2024-01-16 00:09:00 +0000
committerViktor Szépe <viktor@szepe.net>2024-01-16 00:09:00 +0000
commit90ab89a0b0174f8df559b79dc06a03479d959f93 (patch)
tree3d11a790e44945e309f0e68f5332b33b42e72bbb /externals/ffmpeg
parent6531ad56a6d701d84d5ede5f155c5bd91fa70a69 (diff)
parentc683ec2bcb71db6db504d4f1161a7830a8c42774 (diff)
Merge remote-tracking branch 'origin/master' into typos3
Diffstat (limited to 'externals/ffmpeg')
-rw-r--r--externals/ffmpeg/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index f2886eb6c..543585d4f 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -138,7 +138,7 @@ if (NOT WIN32 AND NOT ANDROID)
--cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android-
--sysroot=${SYSROOT}
--target-os=android
- --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
+ --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
--extra-ldflags="-nostdlib"
)
endif()