Merge remote-tracking branch 'origin/master' into dev_videoios

[linphone] / mediastreamer2

diff --git a/mediastreamer2 b/mediastreamer2
index 187a2132cebc630086384bfa8c7a9a50b260cbaf..e297622976e5dcae7ec9de1233178149d30b42ad 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 187a2132cebc630086384bfa8c7a9a50b260cbaf
+Subproject commit e297622976e5dcae7ec9de1233178149d30b42ad