From 160a80e48e32c2a129a484288f4e3975cee4be65 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 13 Mar 2012 17:57:00 +0100 Subject: [PATCH] Use video policy in linphone_core_init_default_params --- coreapi/linphonecore.c | 2 +- mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 938c35baf..08549b3b5 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4733,7 +4733,7 @@ void linphone_core_set_media_encryption_mandatory(LinphoneCore *lc, bool_t m) { } void linphone_core_init_default_params(LinphoneCore*lc, LinphoneCallParams *params) { - params->has_video=linphone_core_video_enabled(lc); + params->has_video=linphone_core_video_enabled(lc) && lc->video_policy.automatically_initiate; params->media_encryption=linphone_core_get_media_encryption(lc); params->in_conference=FALSE; } diff --git a/mediastreamer2 b/mediastreamer2 index 0481d7d11..308dd8b71 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 0481d7d11e445bf04b095f4adc6d3b76f9e86ee2 +Subproject commit 308dd8b71118f98be39de88bc24968ae79c5c660