From d99a286f0bd563206faba3bbab82bc6660db43c6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 1 Mar 2012 22:30:27 +0100 Subject: [PATCH] fix bug when a caller is proposed video but auto acceptance does not work --- coreapi/linphonecore.c | 11 ++++++----- mediastreamer2 | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 3a71dc5be..f30042ba6 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2369,12 +2369,13 @@ int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const linphone_call_state_to_string(call->state)); return -1; } - if (params){ + if (params==NULL){ + call->params.has_video=lc->video_policy.automatically_accept; + }else call->params=*params; - call->camera_active=call->params.has_video; - update_local_media_description(lc,call); - sal_call_set_local_media_description(call->op,call->localdesc); - } + call->camera_active=call->params.has_video; + update_local_media_description(lc,call); + sal_call_set_local_media_description(call->op,call->localdesc); sal_call_accept(call->op); md=sal_call_get_final_media_description(call->op); if (md && !sal_media_description_empty(md)) diff --git a/mediastreamer2 b/mediastreamer2 index 719e03ecd..ccdfee2c3 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 719e03ecd0882063f62315b7cfa26bf4801faa90 +Subproject commit ccdfee2c360b5908fae6c1212551042610272dba