diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 0ca5b7b4a..4073633b9 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -773,8 +773,9 @@ static void video_config_read(LinphoneCore *lc){
 	int capture, display, self_view;
 #endif
 	const char *str;	
+#ifdef VIDEO_ENABLED	
 	LinphoneVideoPolicy vpol;
-
+#endif
 	build_video_devices_table(lc);
 
 	str=lp_config_get_string(lc->config,"video","device",NULL);
diff --git a/mediastreamer2 b/mediastreamer2
index 14187df4b..3279ea72e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 14187df4b75733457792b9b1f1dab6cbf852b45b
+Subproject commit 3279ea72e4938b7b9977e885cd990e981780ef80