From 4a17d1076604faf658dbc334f90ec54857139fb4 Mon Sep 17 00:00:00 2001
From: aymeric <aymeric@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Fri, 24 Oct 2008 12:10:26 +0000
Subject: [PATCH] Fix visualstudio compilation and add missing files for native
 compilation.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@115 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 .../build/win32native/mediastreamer2.vcproj               | 8 ++++++++
 linphone/mediastreamer2/src/winvideo2.c                   | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj b/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj
index f2cb1166a..cdef9b6e7 100755
--- a/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj
+++ b/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj
@@ -341,6 +341,10 @@
 				RelativePath="..\..\src\winsndds.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\winvideo2.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\winvideods.c"
 				>
@@ -435,6 +439,10 @@
 				RelativePath="..\..\include\mediastreamer2\rfc2429.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\vfw-missing.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\mediastreamer2\waveheader.h"
 				>
diff --git a/linphone/mediastreamer2/src/winvideo2.c b/linphone/mediastreamer2/src/winvideo2.c
index f94a28c0f..98475912f 100755
--- a/linphone/mediastreamer2/src/winvideo2.c
+++ b/linphone/mediastreamer2/src/winvideo2.c
@@ -190,10 +190,12 @@ static int _vfw_engine_setup(VfwEngine *obj){
 static VfwEngine * vfw_engine_new(int i){
 	char dev[512];
 	char ver[512];
-	VfwEngine *obj=ms_new0(VfwEngine,1);
+	VfwEngine *obj=(VfwEngine*)ms_new0(VfwEngine,1);
 	if (capGetDriverDescription(i, dev, sizeof (dev),
 		ver, sizeof (ver))){
-		MSVideoSize sz=MS_VIDEO_SIZE_CIF;
+    MSVideoSize sz;
+	  sz.width=MS_VIDEO_SIZE_CIF_W;
+	  sz.height=MS_VIDEO_SIZE_CIF_H;
 		HWND hwnd=capCreateCaptureWindow("Capture Window",WS_CHILD /* WS_OVERLAPPED */
 			,0,0,sz.width,sz.height,HWND_MESSAGE, 0) ;