[Mplayer-cvslog] CVS: main/libmpcodecs ad_realaud.c,1.16,1.17 vd_realvid.c,1.15,1.16 ve_libdv.c,1.4,1.5 ve_vfw.c,1.10,1.11 vf_fame.c,1.8,1.9

[Arpi of Ize]

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

Modified Files:
	ad_realaud.c vd_realvid.c ve_libdv.c ve_vfw.c vf_fame.c 
Log Message:
warning fixes


Index: ad_realaud.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_realaud.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ad_realaud.c	22 Sep 2002 02:33:25 -0000	1.16
+++ ad_realaud.c	29 Sep 2002 19:19:31 -0000	1.17
@@ -33,10 +33,10 @@
 #endif
 
 static unsigned long (*raCloseCodec)(void*);
-static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned long*,long);
+static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned int*,long);
 static unsigned long (*raFlush)(unsigned long,unsigned long,unsigned long);
 static unsigned long (*raFreeDecoder)(void*);
-static unsigned long (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
+static void*         (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
 //static unsigned long (*raGetNumberOfFlavors2)(void);
 static unsigned long (*raInitDecoder)(void*, void*);
 static unsigned long (*raOpenCodec2)(void*);

Index: vd_realvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_realvid.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vd_realvid.c	22 Sep 2002 02:33:25 -0000	1.15
+++ vd_realvid.c	29 Sep 2002 19:19:31 -0000	1.16
@@ -168,7 +168,7 @@
 	// setup rv30 codec (codec sub-type and image dimensions):
 	if(extrahdr[1]>=0x20200002){
 	    unsigned long cmsg24[4]={sh->disp_w,sh->disp_h,sh->disp_w,sh->disp_h};
-	    unsigned long cmsg_data[3]={0x24,1+((extrahdr[0]>>16)&7),&cmsg24};
+	    unsigned long cmsg_data[3]={0x24,1+((extrahdr[0]>>16)&7),(unsigned long) &cmsg24};
 	    (*rvyuv_custom_message)(cmsg_data,sh->context);
 	}
 	mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: RealVideo codec init OK!\n");
@@ -202,7 +202,7 @@
 		dp_hdr->len,	// length of the packet (sub-packets appended)
 		0,		// unknown, seems to be unused
 		dp_hdr->chunks,	// number of sub-packets - 1
-		extra,		// table of sub-packet offsets
+		(unsigned long) extra,	// table of sub-packet offsets
 		0,		// unknown, seems to be unused
 		dp_hdr->timestamp,// timestamp (the integer value from the stream)
 	};

Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ve_libdv.c	10 Sep 2002 22:18:32 -0000	1.4
+++ ve_libdv.c	29 Sep 2002 19:19:31 -0000	1.5
@@ -91,7 +91,7 @@
     vf->put_image=put_image;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
-    vf->priv->mux=args;
+    vf->priv->mux=(aviwrite_stream_t*)args;
     
     vf->priv->enc=dv_encoder_new(1,1,1); // FIXME, parse some options!
     if(!vf->priv->enc) return 0;

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ve_vfw.c	13 Sep 2002 21:55:55 -0000	1.10
+++ ve_vfw.c	29 Sep 2002 19:19:31 -0000	1.11
@@ -42,7 +42,7 @@
     BITMAPINFOHEADER* bih;
 };
 
-static int encoder_hic=0;
+static HIC encoder_hic;
 static void* encoder_buf=NULL;
 static int encoder_buf_size=0;
 static int encoder_frameno=0;
@@ -62,7 +62,7 @@
 //  output_bih->biSize = sizeof(BITMAPINFOHEADER);
 
 //  encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS);
-    encoder_hic = ICOpen( dll_name, out_fourcc, ICMODE_COMPRESS);
+    encoder_hic = ICOpen( (long) dll_name, out_fourcc, ICMODE_COMPRESS);
   if(!encoder_hic){
     mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
     return NULL;

Index: vf_fame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_fame.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vf_fame.c	10 Sep 2002 22:18:32 -0000	1.8
+++ vf_fame.c	29 Sep 2002 19:19:31 -0000	1.9
@@ -73,7 +73,7 @@
     vf->priv->pes.id=0x1E0;
     vf->priv->pes.timestamp=-1; // dunno
     
-    dmpi->planes[0]=&vf->priv->pes;
+    dmpi->planes[0]=(void*) &vf->priv->pes;
     
     return vf_next_put_image(vf,dmpi);
 }