[Mplayer-cvslog] CVS: main/libmpcodecs ad_acm.c,1.7,1.8 vd.h,1.11,1.12 vd_vfw.c,1.21,1.22

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv22697/libmpcodecs

Modified Files:
	ad_acm.c vd.h vd_vfw.c 
Log Message:
wine headers cleanup
- WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h
- lots of useless include wine/* removed from mplayer code
- fixed few warnings


Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ad_acm.c	13 Sep 2002 21:52:31 -0000	1.7
+++ ad_acm.c	22 Sep 2002 00:43:13 -0000	1.8
@@ -8,10 +8,7 @@
 
 #ifdef USE_WIN32DLL
 
-#include "loader.h"
-//#include "wine/mmreg.h"
-#include "wine/vfw.h"
-#include "wine/avifmt.h"
+#include "wineacm.h"
 
 #include "ad_internal.h"
 
@@ -144,10 +141,10 @@
 	    return(uninit(sh));
 	case ACMERR_UNPREPARED:
 	case ACMERR_NOTPOSSIBLE:
-	    return(0);
+	    return;
 	default:
 	    mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occured: %d\n", ret);
-	    return(0);
+	    return;
     }
     
     MSACM_UnregisterAllDrivers();

Index: vd.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd.h	1 Sep 2002 14:30:54 -0000	1.11
+++ vd.h	22 Sep 2002 00:43:13 -0000	1.12
@@ -1,4 +1,5 @@
 
+#include "mp_image.h"
 #include "mpc_info.h"
 typedef mp_codec_info_t vd_info_t;
 

Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vd_vfw.c	13 Sep 2002 21:55:55 -0000	1.21
+++ vd_vfw.c	22 Sep 2002 00:43:13 -0000	1.22
@@ -7,13 +7,11 @@
 
 #ifdef USE_WIN32DLL
 
-#include "loader.h"
-//#include "wine/mmreg.h"
-#include "wine/vfw.h"
-#include "wine/avifmt.h"
-
 #include "vd_internal.h"
 
+#include "wine/driver.h"
+#include "wine/vfw.h"
+
 static vd_info_t info = {
 #ifdef BUILD_VFWEX
 	"Win32/VfWex video codecs",
@@ -143,7 +141,6 @@
 // init driver
 static int init(sh_video_t *sh){
     HRESULT ret;
-    int yuv=0;
 //    unsigned int outfmt=sh->codec->outfmt[sh->outfmtidx];
     int i, o_bih_len;
     vd_vfw_ctx *priv;
@@ -160,7 +157,7 @@
 //    win32_codec_name = sh->codec->dll;
 //    sh->hic = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_FASTDECOMPRESS);
 //    priv->handle = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_DECOMPRESS);
-    priv->handle = ICOpen( sh->codec->dll, sh->bih->biCompression, ICMODE_DECOMPRESS);
+    priv->handle = ICOpen( (long)(sh->codec->dll), sh->bih->biCompression, ICMODE_DECOMPRESS);
     if(!priv->handle){
 	mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
 	return 0;