From bbedbf76523d76851b0026a45da4ba7b00905fdf Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 13 Sep 2013 16:48:50 +0200
Subject: [PATCH] update ms2

---
 coreapi/friend.c         |  8 ++++++++
 coreapi/linphonefriend.h | 11 +++++++++++
 coreapi/private.h        |  1 +
 mediastreamer2           |  2 +-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/coreapi/friend.c b/coreapi/friend.c
index 2aa0db7cf..d045f4c46 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -159,6 +159,14 @@ LinphoneFriend *linphone_friend_new_with_addr(const char *addr){
 	return fr;
 }
 
+void linphone_friend_set_user_data(LinphoneFriend *lf, void *data){
+	lf->up=data;
+}
+
+void* linphone_friend_get_user_data(const LinphoneFriend *lf){
+	return lf->up;
+}
+
 bool_t linphone_friend_in_list(const LinphoneFriend *lf){
 	return lf->lc!=NULL;
 }
diff --git a/coreapi/linphonefriend.h b/coreapi/linphonefriend.h
index 8eea8c052..57697e308 100644
--- a/coreapi/linphonefriend.h
+++ b/coreapi/linphonefriend.h
@@ -228,6 +228,17 @@ LINPHONE_PUBLIC LinphoneOnlineStatus linphone_friend_get_status(const LinphoneFr
  */
 LINPHONE_PUBLIC const LinphonePresenceModel * linphone_friend_get_presence_model(LinphoneFriend *lf);
 
+
+/**
+ * Store user pointer to friend object.
+**/
+LINPHONE_PUBLIC void linphone_friend_set_user_data(LinphoneFriend *lf, void *data);
+
+/**
+ * Retrieve user data associated with friend.
+**/
+LINPHONE_PUBLIC void* linphone_friend_get_user_data(const LinphoneFriend *lf);
+
 LINPHONE_PUBLIC BuddyInfo * linphone_friend_get_info(const LinphoneFriend *lf);
 LINPHONE_PUBLIC void linphone_friend_set_ref_key(LinphoneFriend *lf, const char *key);
 LINPHONE_PUBLIC const char *linphone_friend_get_ref_key(const LinphoneFriend *lf);
diff --git a/coreapi/private.h b/coreapi/private.h
index 7c8dd1667..11899d03e 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -439,6 +439,7 @@ struct _LinphoneFriend{
 	struct _LinphoneCore *lc;
 	BuddyInfo *info;
 	char *refkey;
+	void *up;
 	bool_t subscribe;
 	bool_t subscribe_active;
 	bool_t inc_subscribe_pending;
diff --git a/mediastreamer2 b/mediastreamer2
index 7c4bfcb0b..612d8ec2c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7c4bfcb0baf9ebc0e6edd94fc46b7a512fb733bf
+Subproject commit 612d8ec2c4997f457c1f2142618e2b87b5d46f44