fix broken build (all) and update ms2 and ortp

4964b82f · Simon Morlat · 87d0a6f1 · 4964b82f · 4964b82f · 698cadf4
Commit 4964b82f authored Dec 16, 2011 by Simon Morlat
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

configure.ac configure.ac +1 -1

coreapi/linphonecore.c coreapi/linphonecore.c +2 -0

mediastreamer2 mediastreamer2 +1 -1

oRTP oRTP +1 -1

No files found.
--- a/configure.ac
+++ b/configure.ac
 dnl Process this file with autoconf to produce a configure script.

-AC_INIT([linphone],[3.4.99.4],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.4.99.5],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])


--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4148,7 +4148,9 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	linphone_core_free_payload_types(lc);
 	ortp_exit();
 	linphone_core_set_state(lc,LinphoneGlobalOff,"Off");
+#ifdef TUNNEL_ENABLED
 	if (lc->tunnel) linphone_tunnel_destroy(lc->tunnel);
+#endif
 }

 static void set_network_reachable(LinphoneCore* lc,bool_t isReachable, time_t curtime){

--- a/mediastreamer2 @ 698cadf4
+++ b/mediastreamer2 @ 698cadf4
-Subproject commit d808334925d97bafc3539a59293a309709da3e2e
+Subproject commit 698cadf4ed473f4d1291238852492222209916da
--- a/oRTP @ f1fe7c85
+++ b/oRTP @ f1fe7c85
-Subproject commit 729f35e54053154d92fe3eaf7bdb86bc10aec262
+Subproject commit f1fe7c8502c72cebfcbbee95d27586ba979824c6