From 7e996a610d27447bb796b67ef77a78064f7149da Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 23 Dec 2015 11:06:24 +0100 Subject: [PATCH] no reason to link mkv with all codecs. MKV is on by default now. --- prepare.py | 1 - submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/prepare.py b/prepare.py index fa4b6f7a1..9551fba32 100755 --- a/prepare.py +++ b/prepare.py @@ -193,7 +193,6 @@ def main(argv=None): "-DENABLE_H263P=YES", "-DENABLE_ILBC=YES", "-DENABLE_ISAC=YES", - "-DENABLE_MKV=YES", "-DENABLE_MPEG4=YES", "-DENABLE_OPENH264=YES", "-DENABLE_SILK=YES"] diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e34784d91..b1426c8be 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e34784d911dfe54b9fd7a6516b020f49598c1990 +Subproject commit b1426c8be8ad9ccf02efd2bb771126091dc4fcf8 diff --git a/submodules/linphone b/submodules/linphone index f83d50db0..af1070f04 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f83d50db022ee9c1285d8c5eec382b55442889f1 +Subproject commit af1070f04ce4c51b892315d52ebe0eacae2d4d47