Upgrade FFmpeg to FFmpeg/FFmpeg@b48951b + Updated cflags when building FFmpeg static libraries

vkryl · vkryl · commit ea24630eabe6 · 2023-03-16T15:52:11.000+04:00
diff --git a/app/jni/thirdparty/ffmpeg b/app/jni/thirdparty/ffmpeg
@@ -1 +1 @@
-Subproject commit 8e98dfc57fd05c49095dd964456a7acbb6da634c
+Subproject commit b48951bd29fbec166428efb5a0e27f51ff98fd84
diff --git a/scripts/private/build-ffmpeg-impl.sh b/scripts/private/build-ffmpeg-impl.sh
@@ -56,7 +56,7 @@ function build_one {
   --enable-x86asm \
   --cross-prefix="$CROSS_PREFIX"- \
   --sysroot="$SYSROOT" \
-  --extra-cflags="-w -Werror -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -I$LIBVPX_INCLUDE_DIR --static -fPIC" \
+  --extra-cflags="-fvisibility=hidden -ffunction-sections -fdata-sections -w -Werror -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -I$LIBVPX_INCLUDE_DIR --static -fPIC" \
   --extra-ldflags="-L$LIBVPX_LIB_DIR $EXTRA_LDFLAGS -L -lvpx -Wl,-Bsymbolic -nostdlib -lc -lm -ldl -fPIC" \
   --extra-libs="-lunwind $EXTRA_LIBS" \
   \
diff --git a/version.properties b/version.properties
@@ -4,7 +4,7 @@ version.major=0
 # Anchor date point in app versioning
 version.creation=873642600564
 # Native bundle (/app/jni)
-version.jni=221
+version.jni=222
 # TDLib (/tdlib)
 version.tdlib=96
 # LevelDB (/vkryl/leveldb)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function build_one {`
`56`	`56`	`--enable-x86asm \`
`57`	`57`	`--cross-prefix="$CROSS_PREFIX"- \`
`58`	`58`	`--sysroot="$SYSROOT" \`
`59`		`- --extra-cflags="-w -Werror -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -I$LIBVPX_INCLUDE_DIR --static -fPIC" \`
	`59`	`+ --extra-cflags="-fvisibility=hidden -ffunction-sections -fdata-sections -w -Werror -Wl,-Bsymbolic -Os -DCONFIG_LINUX_PERF=0 -DANDROID $OPTIMIZE_CFLAGS -I$LIBVPX_INCLUDE_DIR --static -fPIC" \`
`60`	`60`	`--extra-ldflags="-L$LIBVPX_LIB_DIR $EXTRA_LDFLAGS -L -lvpx -Wl,-Bsymbolic -nostdlib -lc -lm -ldl -fPIC" \`
`61`	`61`	`--extra-libs="-lunwind $EXTRA_LIBS" \`
`62`	`62`	`\`