diff --git a/linphone/mediastreamer2/build/wince/alldescs.h b/linphone/mediastreamer2/build/wince/alldescs.h
index 896d45f68..697ce911e 100644
--- a/linphone/mediastreamer2/build/wince/alldescs.h
+++ b/linphone/mediastreamer2/build/wince/alldescs.h
@@ -23,9 +23,6 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_arts_read_desc;
//extern MSFilterDesc ms_arts_write_desc;
//extern MSFilterDesc ms_v4l_desc;
-#ifdef VIDEO_ENABLED
-extern MSFilterDesc ms_v4w_desc;
-#endif
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
@@ -57,9 +54,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_arts_read_desc,
//&ms_arts_write_desc,
//&ms_v4l_desc,
-#ifdef VIDEO_ENABLED
-&ms_v4w_desc,
-#endif
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.def b/linphone/mediastreamer2/build/wince/mediastreamer2.def
index 56df94c9e..8c12d4050 100644
--- a/linphone/mediastreamer2/build/wince/mediastreamer2.def
+++ b/linphone/mediastreamer2/build/wince/mediastreamer2.def
@@ -62,5 +62,28 @@ EXPORTS
ms_load_plugins
audio_stream_start
+
+ ms_queue_init
+ ms_queue_flush
+
+ rfc3984_init
+ rfc3984_uninit
+ rfc3984_pack
+ rfc3984_unpack
+ rfc3984_set_mode
+
ms_discover_mtu
ms_set_mtu
+
+ ms_web_cam_new
+ ms_web_cam_manager_reload
+ ms_web_cam_manager_get_default_cam
+ ms_web_cam_manager_get
+ ms_web_cam_manager_get_list
+ ms_web_cam_manager_get_cam
+ ms_web_cam_manager_add_cam
+ ms_web_cam_manager_register_desc
+ ms_web_cam_create_reader
+ ms_web_cam_get_driver_type
+ ms_web_cam_get_name
+ ms_web_cam_get_string_id
diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
index 31b4853d4..cc383ade8 100644
--- a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
+++ b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
@@ -17,6 +17,9 @@
+
@@ -276,6 +279,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -542,10 +1395,6 @@
RelativePath="..\..\src\dtmfgen.c"
>
-
-
@@ -598,10 +1447,18 @@
RelativePath="..\..\src\msticker.c"
>
+
+
+
+
@@ -618,10 +1475,6 @@
RelativePath="..\..\src\void.c"
>
-
-
@@ -688,11 +1541,23 @@
RelativePath="..\..\include\mediastreamer2\msticker.h"
>
+
+
+
+
+
+
diff --git a/linphone/mediastreamer2/src/mscommon.c b/linphone/mediastreamer2/src/mscommon.c
index a8fd0dcb0..3138c3539 100644
--- a/linphone/mediastreamer2/src/mscommon.c
+++ b/linphone/mediastreamer2/src/mscommon.c
@@ -480,8 +480,10 @@ extern MSWebCamDesc ms_dshow_cam_desc;
extern MSWebCamDesc ms_v4m_cam_desc;
#endif
+#if !defined(NO_FFMPEG)
extern MSWebCamDesc static_image_desc;
extern MSWebCamDesc mire_desc;
+#endif
static MSWebCamDesc * ms_web_cam_descs[]={
#ifdef HAVE_LINUX_VIDEODEV2_H
@@ -503,8 +505,10 @@ static MSWebCamDesc * ms_web_cam_descs[]={
&ms_v4m_cam_desc,
#endif
+#if !defined(NO_FFMPEG)
&mire_desc,
&static_image_desc,
+#endif
NULL
};
@@ -539,7 +543,9 @@ void ms_init(){
ms_web_cam_manager_register_desc(wm,ms_web_cam_descs[i]);
}
}
+#if !defined(NO_FFMPEG)
__register_ffmpeg_encoders_if_possible();
+#endif
#endif
ms_message("Loading plugins");
ms_load_plugins(PACKAGE_PLUGINS_DIR);