From 80b306bb0223d5ad5efcfc97c2a0b4684f9f789f Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 1 Jul 2014 13:54:16 +0200 Subject: [PATCH] update ms2 --- gtk/main.c | 2 ++ mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/main.c b/gtk/main.c index 538bb11a2..e9f14c545 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2319,6 +2319,8 @@ core_start: linphone_gtk_init_liblinphone(config_file, factory_config_file, db_file); + if (config_file) free(config_file); + /* do not lower timeouts under 30 ms because it exhibits a bug on gtk+/win32, with cpu running 20% all the time...*/ gtk_timeout_add(30,(GtkFunction)linphone_gtk_iterate,(gpointer)linphone_gtk_get_core()); gtk_timeout_add(30,(GtkFunction)linphone_gtk_check_logs,(gpointer)linphone_gtk_get_core()); diff --git a/mediastreamer2 b/mediastreamer2 index f466a6e17..84ce0753e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f466a6e17e4cb62d48d9ab27b2c231a29ca750dd +Subproject commit 84ce0753edfae002c0f5bcff17f80f6f9c285f14