Merge branch 'master' of git.linphone.org:linphone-private

Conflicts:
	coreapi/linphonecore_jni.cc

diff --cc coreapi/linphonecore_jni.cc
index 029cb30bce1476521441a1a421505047b4ec22e4,43ce0544994bbc6ce4cd24f343519c7a053295a2..1e8855b4dbd59d7be3f981d29b1adb354ae8692d
--- 1/coreapi/linphonecore_jni.cc
--- 2/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@@ -943,12 -943,8 +943,11 @@@ extern "C" void Java_org_linphone_core_
  
  }
  
 -// FIXME stubb function
  extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv* env
                                                                                                                                                ,jobject thiz
 +                                                                                                                                              ,jlong lc
                                                                                                                                                ,jobject obj) {
 -}
 +      linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj);
 +      ms_message("linphone_core_set_native_video_window_id() called !!!!!!!");
 +}
 +
- 

diff --cc mediastreamer2
index e59157a44a7b6aa1f1fa756325047e98c2be3786,e59157a44a7b6aa1f1fa756325047e98c2be3786..7ec60743dfffefc49cc83e47f0eff0ec7928d83a
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit e59157a44a7b6aa1f1fa756325047e98c2be3786
++Subproject commit 7ec60743dfffefc49cc83e47f0eff0ec7928d83a