Merge branch 'upnp'

Conflicts:
	coreapi/callbacks.c
	coreapi/linphonecore.c
	gtk/Makefile.am
	mediastreamer2

diff --cc configure.ac
Simple merge

diff --cc coreapi/callbacks.c
index 784c1f1bdc838b300f6eb3d505620a0014cda5f1,ab5fb780bb27617f82189935ddeab3740173d624..948fc720b37fa65fcd0cdb1c16749d6130e7a862
--- 1/coreapi/callbacks.c
--- 2/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@@ -426,7 -437,12 +438,13 @@@ static void call_accept_update(Linphone
                linphone_core_update_ice_from_remote_media_description(call,rmd);
                linphone_core_update_local_media_description_from_ice(call->localdesc,call->ice_session);
        }
+ #ifdef BUILD_UPNP
+       if(call->upnp_session != NULL) {
+               linphone_core_update_upnp_from_remote_media_description(call, rmd);
+               linphone_core_update_local_media_description_from_upnp(call->localdesc,call->upnp_session);
+       }
+ #endif //BUILD_UPNP
 +      linphone_call_update_remote_session_id_and_ver(call);
        sal_call_accept(call->op);
        md=sal_call_get_final_media_description(call->op);
        if (md && !sal_media_description_empty(md))

diff --cc coreapi/linphonecall.c
Simple merge

diff --cc coreapi/linphonecore.c
index 20788eb1646218337663901d24765786e74a85fd,9545af23ffc2cdfec817f7769838e70c1360133d..c6a2857fcc48eadc74c8838d44b78be9c5ae3cf6
--- 1/coreapi/linphonecore.c
--- 2/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@@ -2761,7 -2812,11 +2834,12 @@@ int linphone_core_start_accept_call_upd
                }
                linphone_core_update_local_media_description_from_ice(call->localdesc, call->ice_session);
        }
+ #ifdef BUILD_UPNP
+       if(call->upnp_session != NULL) {
+               linphone_core_update_local_media_description_from_upnp(call->localdesc, call->upnp_session);
+       }
+ #endif //BUILD_UPNP
 +      linphone_call_update_remote_session_id_and_ver(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);

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc coreapi/misc.c
Simple merge

diff --cc coreapi/private.h
index edb717ae3c3850076b3e2334c8ba8af011f2a9e6,41449dc9e062ef1ba8fc93d255848f90fe68cea7..c421b2bc6f1ef6acc8b4b831c6bc704dac852fb0
--- 1/coreapi/private.h
--- 2/coreapi/private.h
+++ b/coreapi/private.h
@@@ -286,9 -292,9 +294,10 @@@ void linphone_call_stop_audio_stream(Li
  void linphone_call_stop_video_stream(LinphoneCall *call);
  void linphone_call_stop_media_streams(LinphoneCall *call);
  void linphone_call_delete_ice_session(LinphoneCall *call);
+ void linphone_call_delete_upnp_session(LinphoneCall *call);
  void linphone_call_stop_media_streams_for_ice_gathering(LinphoneCall *call);
  void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescription *old_md, SalMediaDescription *new_md);
 +void linphone_call_update_remote_session_id_and_ver(LinphoneCall *call);
  
  const char * linphone_core_get_identity(LinphoneCore *lc);
  const char * linphone_core_get_route(LinphoneCore *lc);

diff --cc mediastreamer2
index 3a231efb89305d775ab39a6866ee981a891aed7e,b21f304297319e15fbe0beb3509592022eb8e88a..2e0ef7e31e919b524cfbe1ff4ffbc409fce3599c
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3a231efb89305d775ab39a6866ee981a891aed7e
 -Subproject commit b21f304297319e15fbe0beb3509592022eb8e88a
++Subproject commit 2e0ef7e31e919b524cfbe1ff4ffbc409fce3599c