diff --git a/linphone/mediastreamer2/NEWS b/linphone/mediastreamer2/NEWS
index 70c027945..976fab11c 100644
--- a/linphone/mediastreamer2/NEWS
+++ b/linphone/mediastreamer2/NEWS
@@ -1,3 +1,8 @@
+mediastreamer-2.2.4:
+	* fix crash during video window resizing on windows
+	* improve documentation
+	* various little improvements
+
 mediastreamer-2.2.3: 21, January 2009
 	* rfc3984 support improved 
 	* webcam support on windows largely improved (vfw mode)
diff --git a/linphone/mediastreamer2/src/theora.c b/linphone/mediastreamer2/src/theora.c
index 238007287..1ab543278 100644
--- a/linphone/mediastreamer2/src/theora.c
+++ b/linphone/mediastreamer2/src/theora.c
@@ -129,18 +129,18 @@ static int enc_set_br(MSFilter *f, void*data){
 	if (br>=1024000){
 		vsize.width = MS_VIDEO_SIZE_4CIF_W;
 		vsize.height = MS_VIDEO_SIZE_4CIF_H;
-		s->tinfo.quality=32;
-		fps=15;
+		s->tinfo.quality=15;
+		fps=30;
 	}else if (br>=512000){
 		vsize.width = MS_VIDEO_SIZE_CIF_W;
 		vsize.height = MS_VIDEO_SIZE_CIF_H;
-		s->tinfo.quality=32;
+		s->tinfo.quality=15;
 		fps=15;
 	}else if (br>=256000){
 		vsize.width = MS_VIDEO_SIZE_CIF_W;
 		vsize.height = MS_VIDEO_SIZE_CIF_H;
 		s->tinfo.quality=5;
-		fps=12;
+		fps=15;
 	}else if(br>=128000){
 		vsize.width=MS_VIDEO_SIZE_QCIF_W;
 		vsize.height=MS_VIDEO_SIZE_QCIF_H;
diff --git a/linphone/mediastreamer2/src/videoout.c b/linphone/mediastreamer2/src/videoout.c
index 341d464ba..1b018b1c6 100644
--- a/linphone/mediastreamer2/src/videoout.c
+++ b/linphone/mediastreamer2/src/videoout.c
@@ -137,6 +137,7 @@ static bool_t sdl_display_init(MSDisplay *obj, MSPicture *fbuf){
 		sdl_initialized=TRUE;
 		ms_mutex_init(&sdl_mutex,NULL);
 	}
+	ms_mutex_lock(&sdl_mutex);
 	if (obj->data!=NULL){
 		SDL_FreeYUVOverlay((SDL_Overlay*)obj->data);
 	}
@@ -156,8 +157,10 @@ static bool_t sdl_display_init(MSDisplay *obj, MSPicture *fbuf){
 		obj->data=lay;
 		sdl_show_window(TRUE);
 		obj->window_id=sdl_get_native_window_id();
+		ms_mutex_unlock(&sdl_mutex);
 		return TRUE;
 	}
+	ms_mutex_unlock(&sdl_mutex);
 	return FALSE;
 }
 
diff --git a/linphone/mediastreamer2/tests/mediastream.c b/linphone/mediastreamer2/tests/mediastream.c
index 44c3c93f0..4edd0e01a 100644
--- a/linphone/mediastreamer2/tests/mediastream.c
+++ b/linphone/mediastreamer2/tests/mediastream.c
@@ -189,9 +189,8 @@ int main(int argc, char * argv[])
 		}else if (strcmp(argv[i],"--ec")==0){
 			ec=TRUE;
 		}
-		
-		
 	}
+
 	run_media_streams(localport,ip,remoteport,payload,fmtp,jitter,ec,bitrate,vs);
 	return 0;
 }