From 71e654ad95ee593d802682f00391642d795900af Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 9 Jan 2014 19:00:17 +0100
Subject: [PATCH] change default dscp for video, because it is problematic on
 some routers to have two streams in parallel using the same dscp value.

---
 coreapi/linphonecore.c | 2 +-
 mediastreamer2         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 9f90061ec..f21f9af6e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -6272,7 +6272,7 @@ void linphone_core_set_video_dscp(LinphoneCore *lc, int dscp){
  * 
 **/
 int linphone_core_get_video_dscp(const LinphoneCore *lc){
-	return lp_config_get_int(lc->config,"rtp","video_dscp",0x2e);
+	return lp_config_get_int(lc->config,"rtp","video_dscp",0);
 }
 
 
diff --git a/mediastreamer2 b/mediastreamer2
index 98c240f78..f17f45205 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 98c240f782a04db0cca32656635f5674eb933fd7
+Subproject commit f17f4520583843757237214b54ce8770886f7752