From 8815f986bbb8617354c867d7bb424aad7de73b5e Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 22 May 2012 08:16:03 -0400 Subject: [PATCH 1/2] Fix unused variable with disabled video --- coreapi/linphonecore.c | 3 ++- mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 0ca5b7b4a..4073633b9 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -773,8 +773,9 @@ static void video_config_read(LinphoneCore *lc){ int capture, display, self_view; #endif const char *str; +#ifdef VIDEO_ENABLED LinphoneVideoPolicy vpol; - +#endif build_video_devices_table(lc); str=lp_config_get_string(lc->config,"video","device",NULL); diff --git a/mediastreamer2 b/mediastreamer2 index 14187df4b..df295558f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 14187df4b75733457792b9b1f1dab6cbf852b45b +Subproject commit df295558fd536483b0ac16d8bfde76cc8dad1c9a From 409282ca6357ea1b6d8f4791725b27dfb5bdc142 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 22 May 2012 14:29:47 +0200 Subject: [PATCH 2/2] Update mediastreamer2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index df295558f..3279ea72e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit df295558fd536483b0ac16d8bfde76cc8dad1c9a +Subproject commit 3279ea72e4938b7b9977e885cd990e981780ef80