Merge branch 'dev_videoios' into local_videoios

Conflicts:
	oRTP

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc coreapi/private.h
index 49c7c4016703525e135b778cb41df1e99fe58464,b8aba9d1ff7595e59352b1259d2e0678712320c7..f90f27bf21ae628c893ff5eb212e31dda71009c5
--- 1/coreapi/private.h
--- 2/coreapi/private.h
+++ b/coreapi/private.h
@@@ -43,6 -43,6 +43,10 @@@
  #define PACKAGE_SOUND_DIR "."
  #endif
  
++#ifndef PACKAGE_DATA_DIR
++#define PACKAGE_DATA_DIR "."
++#endif
++
  #ifdef HAVE_GETTEXT
  #include <libintl.h>
  #ifndef _

diff --cc mediastreamer2
index 0221aa7bce67b18c299c09033dc5b809423550ce,3fab7e1b190a4d2bb4a8d7514acfa5b0bcdb4e3e..98198b49dc5f4bd7f192e87b6abd88e5c1e08a3a
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0221aa7bce67b18c299c09033dc5b809423550ce
 -Subproject commit 3fab7e1b190a4d2bb4a8d7514acfa5b0bcdb4e3e
++Subproject commit 98198b49dc5f4bd7f192e87b6abd88e5c1e08a3a