diff --git a/gradle.properties b/gradle.properties
index 818481447..a4996c82d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,5 @@ RELEASE_STORE_FILE=""
 RELEASE_STORE_PASSWORD=
 RELEASE_KEY_ALIAS=
 RELEASE_KEY_PASSWORD=
-
-#org.gradle.jvmargs=-XX\:MaxHeapSize\=2048M -Xmx2048M
-org.gradle.jvmargs=-Xmx1536M
+#source:https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
+org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2
index f4b87c521..ca4a89930 160000
--- a/submodules/bcmatroska2
+++ b/submodules/bcmatroska2
@@ -1 +1 @@
-Subproject commit f4b87c521a513b540f34a72ef82a52364929d0be
+Subproject commit ca4a89930dd8db94a60ae4a1dbf44a3710497429