Merge remote-tracking branch 'private/dev_videoios'

Conflicts:
	mediastreamer2

diff --cc configure.ac
Simple merge

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc coreapi/private.h
Simple merge

diff --cc mediastreamer2
index fb45658a172fa53f0fd722b0660cc9b8c4396752,7e80b7c99175ff4165814eaa90d13a7b1bd7a869..4ee916b3fcae0aba38a0d595079298242c9ac2cd
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fb45658a172fa53f0fd722b0660cc9b8c4396752
 -Subproject commit 7e80b7c99175ff4165814eaa90d13a7b1bd7a869
++Subproject commit 4ee916b3fcae0aba38a0d595079298242c9ac2cd