diff --git a/TMessagesProj/jni/Application.mk b/TMessagesProj/jni/Application.mk index a4488e1c8..c29d77286 100644 --- a/TMessagesProj/jni/Application.mk +++ b/TMessagesProj/jni/Application.mk @@ -1,4 +1,3 @@ APP_PLATFORM := android-16 NDK_TOOLCHAIN_VERSION := clang -APP_SHORT_COMMANDS := true -APP_STL := c++_static +APP_STL := c++_static \ No newline at end of file diff --git a/TMessagesProj/jni/ffmpeg b/TMessagesProj/jni/ffmpeg index 192d1d34e..d3b963cc4 160000 --- a/TMessagesProj/jni/ffmpeg +++ b/TMessagesProj/jni/ffmpeg @@ -1 +1 @@ -Subproject commit 192d1d34eb3668fa27f433e96036340e1e5077a0 +Subproject commit d3b963cc41824a3c5b2758ac896fb23e20a87875 diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java index 044e10a50..6604c3af6 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java @@ -6036,7 +6036,7 @@ public class SendMessagesHelper extends BaseController implements NotificationCe if (forceDocument) { videoEditedInfo = null; } else { - videoEditedInfo = info.videoEditedInfo != null ? info.videoEditedInfo : createCompressionSettings(info.path); + videoEditedInfo = info.videoEditedInfo; } if (!forceDocument && (videoEditedInfo != null || info.path.endsWith("mp4"))) {