diff --git a/console/commands.c b/console/commands.c
index 6f527831e..5fca480a6 100644
--- a/console/commands.c
+++ b/console/commands.c
@@ -287,10 +287,10 @@ static LPC_COMMAND advanced_commands[] = {
             "'codec list' : list audio codecs\n"
             "'codec enable <index>' : enable available audio codec\n"
             "'codec disable <index>' : disable audio codec" },
-    { "vcodec", lpc_cmd_vcodec, "Video codec configuration",
-            "'vcodec list' : list video codecs\n"
-            "'vcodec enable <index>' : enable available video codec\n"
-            "'vcodec disable <index>' : disable video codec" },
+	{ "vcodec", lpc_cmd_vcodec, "Video codec configuration",
+		"'vcodec list' : list video codecs\n"
+		"'vcodec enable <index>' : enable available video codec\n"
+		"'vcodec disable <index>' : disable video codec" },
 	{ "ec", lpc_cmd_echocancellation, "Echo cancellation",
 	    "'ec on [<delay>] [<tail>] [<framesize>]' : turn EC on with given delay, tail length and framesize\n"
 	    "'ec off' : turn echo cancellation (EC) off\n"
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index f1deb704d..2b65fb5cd 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -5227,7 +5227,7 @@ static void toggle_video_preview(LinphoneCore *lc, bool_t val){
 		if (lc->previewstream==NULL){
 			const char *display_filter=linphone_core_get_video_display_filter(lc);
 			MSVideoSize vsize=lc->video_conf.preview_vsize.width!=0 ? lc->video_conf.preview_vsize : lc->video_conf.vsize;
-			lc->previewstream=video_preview_new();
+			lc->previewstream=video_preview_new(lc->factory);
 			video_preview_set_size(lc->previewstream,vsize);
 			if (display_filter)
 				video_preview_set_display_filter_name(lc->previewstream,display_filter);
diff --git a/mediastreamer2 b/mediastreamer2
index 2011ba719..3cf3ebfec 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2011ba719ebd639eb084b39733f12bd67bff01e3
+Subproject commit 3cf3ebfec8b0c3c42c297e101d55754bd995a798