From 8b1a36aca4e3489612215eaeacc75a2b7a91994c Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 9 Sep 2010 22:12:23 +0200
Subject: [PATCH] fix crash and c++ compilation problem

---
 coreapi/linphonecore.c |  2 +-
 coreapi/linphonecore.h | 35 +++++++++++++++++------------------
 mediastreamer2         |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 5f07f2749..0bbfe8af1 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1697,7 +1697,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 		if (lc->previewstream==NULL && lc->calls==NULL)
 			toggle_video_preview(lc,TRUE);
 #ifdef VIDEO_ENABLED
-		else video_stream_iterate(lc->previewstream);
+		if (lc->previewstream) video_stream_iterate(lc->previewstream);
 #endif
 	}else{
 		if (lc->previewstream!=NULL)
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index e8bbd41ba..c845e4596 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -159,9 +159,25 @@ char * linphone_call_log_to_str(LinphoneCallLog *cl);
  * The LinphoneCall object represents a call issued or received by the LinphoneCore
 **/
 struct _LinphoneCall;
-enum _LinphoneCallState;
 typedef struct _LinphoneCall LinphoneCall;
 
+typedef enum _LinphoneCallState{
+	LinphoneCallIdle,
+	LinphoneCallIncomingReceived,
+	LinphoneCallOutgoingInit,
+	LinphoneCallOutgoingProgress,
+	LinphoneCallOutgoingRinging,
+	LinphoneCallOutgoingEarlyMedia,
+	LinphoneCallConnected,
+	LinphoneCallStreamsRunning,
+	LinphoneCallPausing,
+	LinphoneCallPaused,
+	LinphoneCallResuming,
+	LinphoneCallRefered,
+	LinphoneCallError,
+	LinphoneCallEnd,
+} LinphoneCallState;
+
 
 enum _LinphoneCallState linphone_call_get_state(const LinphoneCall *call);
 bool_t linphone_call_asked_to_autoanswer(LinphoneCall *call);
@@ -367,23 +383,6 @@ void linphone_chat_room_destroy(LinphoneChatRoom *cr);
 void linphone_chat_room_set_user_data(LinphoneChatRoom *cr, void * ud);
 void * linphone_chat_room_get_user_data(LinphoneChatRoom *cr);
 
-typedef enum _LinphoneCallState{
-	LinphoneCallIdle,
-	LinphoneCallIncomingReceived,
-	LinphoneCallOutgoingInit,
-	LinphoneCallOutgoingProgress,
-	LinphoneCallOutgoingRinging,
-	LinphoneCallOutgoingEarlyMedia,
-	LinphoneCallConnected,
-	LinphoneCallStreamsRunning,
-	LinphoneCallPausing,
-	LinphoneCallPaused,
-	LinphoneCallResuming,
-	LinphoneCallRefered,
-	LinphoneCallError,
-	LinphoneCallEnd,
-} LinphoneCallState;
-
 typedef enum _LinphoneGlobalState{
 	LinphoneGlobalOff,
 	LinphoneGlobalStartup,
diff --git a/mediastreamer2 b/mediastreamer2
index 645d53a36..82a85774e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 645d53a36dd0b87c085351ee7caa84d499d19166
+Subproject commit 82a85774e4912672b5820c630605543aefc032cc