From d8469f7074b64493299841432835a66a0ec1403e Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Jul 2013 15:29:47 +0200
Subject: [PATCH] =?UTF-8?q?Add=20XGA,=20SXGA=E2=88=92=20and=20UXGA=20to=20?=
 =?UTF-8?q?the=20list=20of=20supported=20HD=20resolutions.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coreapi/linphonecore.c | 3 +++
 mediastreamer2         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 15ca4867a..329a273cd 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -4960,6 +4960,9 @@ static MSVideoSizeDef supported_resolutions[]={
 #ifdef ENABLE_HD
 	{	{MS_VIDEO_SIZE_1080P_W,MS_VIDEO_SIZE_1080P_H}	,	"1080p"	},
 	{	{MS_VIDEO_SIZE_720P_W,MS_VIDEO_SIZE_720P_H}	,	"720p"	},
+	{	{ MS_VIDEO_SIZE_UXGA_W, MS_VIDEO_SIZE_UXGA_H }	,	"uxga"	},
+	{	{ MS_VIDEO_SIZE_SXGA_MINUS_W, MS_VIDEO_SIZE_SXGA_MINUS_H	,	"sxga-"	},
+	{	{ MS_VIDEO_SIZE_XGA_W, MS_VIDEO_SIZE_XGA_H }	,	"xga"	},
 #endif
 	{	{MS_VIDEO_SIZE_SVGA_W,MS_VIDEO_SIZE_SVGA_H}	,	"svga"	},
 	{	{MS_VIDEO_SIZE_4CIF_W,MS_VIDEO_SIZE_4CIF_H}	,	"4cif"	},
diff --git a/mediastreamer2 b/mediastreamer2
index 9398ac25a..2d30405af 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9398ac25a804fa4e6ee9ac0b3ed2774a4fea13ea
+Subproject commit 2d30405af1fbfd8192de3ebecdd9db01011b4672