From 4964b82f260e79344592f5c2169dd4c260609ef8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 16 Dec 2011 17:46:34 +0100 Subject: [PATCH] fix broken build (all) and update ms2 and ortp --- configure.ac | 2 +- coreapi/linphonecore.c | 2 ++ mediastreamer2 | 2 +- oRTP | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2f206354b..6e5e0da42 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ 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]) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 387ad5621..ecbd18f28 100644 --- 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){ diff --git a/mediastreamer2 b/mediastreamer2 index d80833492..698cadf4e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit d808334925d97bafc3539a59293a309709da3e2e +Subproject commit 698cadf4ed473f4d1291238852492222209916da diff --git a/oRTP b/oRTP index 729f35e54..f1fe7c850 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 729f35e54053154d92fe3eaf7bdb86bc10aec262 +Subproject commit f1fe7c8502c72cebfcbbee95d27586ba979824c6