[Mplayer-cvslog] CVS: main/libmpcodecs ad_realaud.c,1.15,1.16 dec_video.h,1.10,1.11 vd_ijpg.c,1.9,1.10 vd_mpng.c,1.3,1.4 vd_mtga.c,1.3,1.4 vd_realvid.c,1.14,1.15 vf_cropdetect.c,1.5,1.6

Arpi of Ize arpi at mplayerhq.hu
Sun Sep 22 04:33:58 CEST 2002


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

Modified Files:
	ad_realaud.c dec_video.h vd_ijpg.c vd_mpng.c vd_mtga.c 
	vd_realvid.c vf_cropdetect.c 
Log Message:
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug


Index: ad_realaud.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_realaud.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ad_realaud.c	30 Aug 2002 21:44:20 -0000	1.15
+++ ad_realaud.c	22 Sep 2002 02:33:25 -0000	1.16
@@ -32,15 +32,15 @@
 void *__ctype_b=NULL;
 #endif
 
-static unsigned long (*raCloseCodec)(unsigned long);
-static unsigned long (*raDecode)(unsigned long,unsigned long,unsigned long,unsigned long,unsigned long,unsigned long);
+static unsigned long (*raCloseCodec)(void*);
+static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned long*,long);
 static unsigned long (*raFlush)(unsigned long,unsigned long,unsigned long);
-static unsigned long (*raFreeDecoder)(unsigned long);
-static unsigned long (*raGetFlavorProperty)(unsigned long,unsigned long,unsigned long,unsigned long);
+static unsigned long (*raFreeDecoder)(void*);
+static unsigned long (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
 //static unsigned long (*raGetNumberOfFlavors2)(void);
-static unsigned long (*raInitDecoder)(unsigned long,unsigned long);
-static unsigned long (*raOpenCodec2)(unsigned long);
-static unsigned long (*raSetFlavor)(unsigned long,unsigned long);
+static unsigned long (*raInitDecoder)(void*, void*);
+static unsigned long (*raOpenCodec2)(void*);
+static unsigned long (*raSetFlavor)(void*,unsigned long);
 //static void  (*raSetDLLAccessPath)(unsigned long);
 static void  (*raSetPwd)(char*,char*);
 
@@ -59,7 +59,7 @@
   // let's check if the driver is available, return 0 if not.
   // (you should do that if you use external lib(s) which is optional)
   unsigned int result;
-  int len;
+  int len=0;
   void* prop;
   char path[4096];
   sprintf(path, REALCODEC_PATH "/%s", sh->codec->dll);
@@ -97,8 +97,7 @@
   sh->samplesize=sh->wf->wBitsPerSample/8;
   sh->channels=sh->wf->nChannels;
 
-  { unsigned char temp2[16]={1,0,0,3,4,0,0,0x14,0,0,0,0,0,1,0,3};
-    // note: temp2[] come from audio stream extra header (last 16 of the total 24 bytes)
+  { 
     ra_init_t init_data={
 	sh->wf->nSamplesPerSec,sh->wf->wBitsPerSample,sh->wf->nChannels,
 	100, // ???

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dec_video.h	31 Aug 2002 13:09:23 -0000	1.10
+++ dec_video.h	22 Sep 2002 02:33:25 -0000	1.11
@@ -13,6 +13,7 @@
 extern int get_video_quality_max(sh_video_t *sh_video);
 extern void set_video_quality(sh_video_t *sh_video,int quality);
 
+int get_video_colors(sh_video_t *sh_video,char *item,int *value);
 extern int set_video_colors(sh_video_t *sh_video,char *item,int value);
 extern int set_rectangle(sh_video_t *sh_video,int param,int value);
 

Index: vd_ijpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ijpg.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vd_ijpg.c	30 Aug 2002 21:44:20 -0000	1.9
+++ vd_ijpg.c	22 Sep 2002 02:33:25 -0000	1.10
@@ -63,7 +63,6 @@
 METHODDEF(boolean) fill_input_buffer (j_decompress_ptr cinfo)
 {
  my_src_ptr src = (my_src_ptr) cinfo->src;                                                         
- size_t nbytes;                                                                                    
  src->pub.next_input_byte = src->inbuf;
  src->pub.bytes_in_buffer = src->bufsize;
  return TRUE;

Index: vd_mpng.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_mpng.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_mpng.c	30 Aug 2002 21:44:20 -0000	1.3
+++ vd_mpng.c	22 Sep 2002 02:33:25 -0000	1.4
@@ -66,7 +66,6 @@
 //    png_bytep       data;
     png_bytep     * row_p;
     png_uint_32     png_width=0,png_height=0;
-    char	  * palette = NULL;
     int             depth,color;
     png_uint_32     i;
     mp_image_t* mpi;

Index: vd_mtga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_mtga.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_mtga.c	15 Sep 2002 13:29:00 -0000	1.3
+++ vd_mtga.c	22 Sep 2002 02:33:25 -0000	1.4
@@ -62,7 +62,6 @@
 /* to set/get/query special features/parameters */
 static int control(sh_video_t *sh, int cmd, void *arg, ...)
 {
-    TGAInfo	*info = (TGAInfo *) sh->context;
     switch (cmd)
     {
 	case VDCTRL_QUERY_FORMAT:

Index: vd_realvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_realvid.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vd_realvid.c	30 Aug 2002 21:44:20 -0000	1.14
+++ vd_realvid.c	22 Sep 2002 02:33:25 -0000	1.15
@@ -22,11 +22,11 @@
 LIBVD_EXTERN(realvid)
 
 
-unsigned long (*rvyuv_custom_message)(unsigned long,unsigned long);
-unsigned long (*rvyuv_free)(unsigned long);
+unsigned long (*rvyuv_custom_message)(unsigned long*,void*);
+unsigned long (*rvyuv_free)(void*);
 unsigned long (*rvyuv_hive_message)(unsigned long,unsigned long);
-unsigned long (*rvyuv_init)(unsigned long,unsigned long);
-unsigned long (*rvyuv_transform)(unsigned long,unsigned long,unsigned long,unsigned long,unsigned long);
+unsigned long (*rvyuv_init)(void*, void*); // initdata,context
+unsigned long (*rvyuv_transform)(char*, char*,unsigned long*,unsigned long*,void*);
 
 void *rv_handle=NULL;
 
@@ -65,7 +65,6 @@
 /* exits program when failure */
 int load_syms_linux(char *path) {
 		void *handle;
-		char *error;
 
 		mp_msg(MSGT_DECVIDEO,MSGL_INFO, "opening shared obj '%s'\n", path);
 		rv_handle = dlopen (path, RTLD_LAZY);

Index: vf_cropdetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_cropdetect.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_cropdetect.c	10 Sep 2002 22:18:32 -0000	1.5
+++ vf_cropdetect.c	22 Sep 2002 02:33:25 -0000	1.6
@@ -22,7 +22,6 @@
 static int checkline(unsigned char* src,int stride,int len,int bpp){
     int total=0;
     int div=len;
-    int x;
     switch(bpp){
     case 1:
 	while(--len>=0){




More information about the MPlayer-cvslog mailing list