[Mplayer-cvslog] CVS: main/libmpcodecs ad_acm.c,1.9,1.10 ad_qtaudio.c,1.1,1.2 dec_audio.c,1.17,1.18 dec_video.c,1.153,1.154 vd_lzo.c,1.5,1.6 vd_vfw.c,1.24,1.25 ve_vfw.c,1.11,1.12 ve_xvid.c,1.4,1.5 vf_1bpp.c,1.2,1.3 vf_2xsai.c,1.1,1.2 vf_boxblur.c,1.1,1.2 vf_il.c,1.3,1.4 vf_pp.c,1.19,1.20

Arpi of Ize arpi at mplayerhq.hu
Thu Nov 7 00:54:57 CET 2002 

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

Modified Files:
	ad_acm.c ad_qtaudio.c dec_audio.c dec_video.c vd_lzo.c 
	vd_vfw.c ve_vfw.c ve_xvid.c vf_1bpp.c vf_2xsai.c vf_boxblur.c 
	vf_il.c vf_pp.c 
Log Message:
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik at rangers.eu.org>


Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ad_acm.c	1 Nov 2002 17:46:43 -0000	1.9
+++ ad_acm.c	6 Nov 2002 23:54:24 -0000	1.10
@@ -39,11 +39,13 @@
   return 1;
 }
 
+extern void print_wave_header(WAVEFORMATEX *h);
+
 static int preinit(sh_audio_t *sh_audio)
 {
     HRESULT ret;
     WAVEFORMATEX *in_fmt = sh_audio->wf;
-    unsigned int srcsize = 0;
+    DWORD srcsize = 0;
     acm_context_t *priv;
     
     priv = malloc(sizeof(acm_context_t));

Index: ad_qtaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_qtaudio.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ad_qtaudio.c	31 Oct 2002 23:11:34 -0000	1.1
+++ ad_qtaudio.c	6 Nov 2002 23:54:24 -0000	1.2
@@ -192,11 +192,11 @@
     WantedBufferSize=OutputFormatInfo.numChannels*OutputFormatInfo.sampleRate*2;
     error = SoundConverterGetBufferSizes(myConverter,
 	WantedBufferSize,&FramesToGet,&InputBufferSize,&OutputBufferSize);
-    printf("SoundConverterGetBufferSizes:%i\n");
-    printf("WantedBufferSize = %i\n",WantedBufferSize);
-    printf("InputBufferSize  = %i\n",InputBufferSize);
-    printf("OutputBufferSize = %i\n",OutputBufferSize);
-    printf("FramesToGet = %i\n",FramesToGet);
+    printf("SoundConverterGetBufferSizes:%i\n",error);
+    printf("WantedBufferSize = %li\n",WantedBufferSize);
+    printf("InputBufferSize  = %li\n",InputBufferSize);
+    printf("OutputBufferSize = %li\n",OutputBufferSize);
+    printf("FramesToGet = %li\n",FramesToGet);
     
     InFrameSize=InputBufferSize/FramesToGet;
     OutFrameSize=OutputBufferSize/FramesToGet;
@@ -256,7 +256,7 @@
 
     InputBufferSize=FramesToGet*InFrameSize;
 
-    printf("FramesToGet = %i  (%i -> %i bytes)\n",FramesToGet,
+    printf("FramesToGet = %li  (%li -> %li bytes)\n",FramesToGet,
 	InputBufferSize, FramesToGet*OutFrameSize);
 
     if(InputBufferSize>sh->a_in_buffer_len){
@@ -270,8 +270,8 @@
     error = SoundConverterConvertBuffer(myConverter,sh->a_in_buffer,
 	FramesToGet,buf,&ConvertedFrames,&ConvertedBytes);
     printf("SoundConverterConvertBuffer:%i\n",error);
-    printf("ConvertedFrames = %i\n",ConvertedFrames);
-    printf("ConvertedBytes = %i\n",ConvertedBytes);
+    printf("ConvertedFrames = %li\n",ConvertedFrames);
+    printf("ConvertedBytes = %li\n",ConvertedBytes);
     
     InputBufferSize=(ConvertedBytes/OutFrameSize)*InFrameSize; // FIXME!!
     sh->a_in_buffer_len-=InputBufferSize;

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dec_audio.c	1 Nov 2002 17:46:43 -0000	1.17
+++ dec_audio.c	6 Nov 2002 23:54:24 -0000	1.18
@@ -45,7 +45,6 @@
 
 int init_audio_codec(sh_audio_t *sh_audio)
 {
-  unsigned i;
 
   // reset in/out buffer size/pointer:
   sh_audio->a_buffer_size=0;
@@ -165,6 +164,8 @@
     }
     return 0;
 }
+
+extern char *get_path(char *filename);
 
 int init_best_audio_codec(sh_audio_t *sh_audio,char** audio_codec_list,char** audio_fm_list){
 char* ac_l_default[2]={"",(char*)NULL};

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- dec_video.c	1 Nov 2002 17:46:43 -0000	1.153
+++ dec_video.c	6 Nov 2002 23:54:24 -0000	1.154
@@ -202,6 +202,8 @@
     return 0;
 }
 
+extern char *get_path(char *filename);
+
 int init_best_video_codec(sh_video_t *sh_video,char** video_codec_list,char** video_fm_list){
 char* vc_l_default[2]={"",(char*)NULL};
 // hack:

Index: vd_lzo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_lzo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vd_lzo.c	29 Oct 2002 16:50:34 -0000	1.5
+++ vd_lzo.c	6 Nov 2002 23:54:24 -0000	1.6
@@ -98,10 +98,8 @@
 {
     static int init_done = 0;
     int r;
-    int cb = 1;
-    int cr = 2;
     mp_image_t* mpi;
-    int w, h;
+    int w;
     lzo_context_t *priv = sh->context;
 
     if (len <= 0) {

Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vd_vfw.c	1 Nov 2002 17:46:43 -0000	1.24
+++ vd_vfw.c	6 Nov 2002 23:54:24 -0000	1.25
@@ -138,6 +138,8 @@
     return CONTROL_UNKNOWN;
 }
 
+extern void print_video_header(BITMAPINFOHEADER *h);
+
 // init driver
 static int init(sh_video_t *sh){
     HRESULT ret;

Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ve_vfw.c	29 Sep 2002 19:19:31 -0000	1.11
+++ ve_vfw.c	6 Nov 2002 23:54:24 -0000	1.12
@@ -74,9 +74,9 @@
   ICINFO icinfo;
 
   ret = ICGetInfo(encoder_hic, &icinfo, sizeof(ICINFO));
-  printf("%d - %d - %d\n", ret, icinfo.dwSize, sizeof(ICINFO));
-printf("Compressor type: %.4x\n", icinfo.fccType);
-printf("Compressor subtype: %.4x\n", icinfo.fccHandler);
+  printf("%ld - %ld - %d\n", ret, icinfo.dwSize, sizeof(ICINFO));
+printf("Compressor type: %.4lx\n", icinfo.fccType);
+printf("Compressor subtype: %.4lx\n", icinfo.fccHandler);
 printf("Compressor flags: %lu, version %lu, ICM version: %lu\n",
     icinfo.dwFlags, icinfo.dwVersion, icinfo.dwVersionICM);
 //printf("Compressor name: %s\n", icinfo.szName);
@@ -130,21 +130,21 @@
 //  if(verbose) {
     printf("Starting compression:\n");
     printf(" Input format:\n");
-	printf("  biSize %ld\n", input_bih->biSize);
-	printf("  biWidth %ld\n", input_bih->biWidth);
-	printf("  biHeight %ld\n", input_bih->biHeight);
+	printf("  biSize %d\n", input_bih->biSize);
+	printf("  biWidth %d\n", input_bih->biWidth);
+	printf("  biHeight %d\n", input_bih->biHeight);
 	printf("  biPlanes %d\n", input_bih->biPlanes);
 	printf("  biBitCount %d\n", input_bih->biBitCount);
-	printf("  biCompression 0x%lx ('%.4s')\n", input_bih->biCompression, (char *)&input_bih->biCompression);
-	printf("  biSizeImage %ld\n", input_bih->biSizeImage);
+	printf("  biCompression 0x%x ('%.4s')\n", input_bih->biCompression, (char *)&input_bih->biCompression);
+	printf("  biSizeImage %d\n", input_bih->biSizeImage);
     printf(" Output format:\n");
-	printf("  biSize %ld\n", output_bih->biSize);
-	printf("  biWidth %ld\n", output_bih->biWidth);
-	printf("  biHeight %ld\n", output_bih->biHeight);
+	printf("  biSize %d\n", output_bih->biSize);
+	printf("  biWidth %d\n", output_bih->biWidth);
+	printf("  biHeight %d\n", output_bih->biHeight);
 	printf("  biPlanes %d\n", output_bih->biPlanes);
 	printf("  biBitCount %d\n", output_bih->biBitCount);
-	printf("  biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
-	printf("  biSizeImage %ld\n", output_bih->biSizeImage);
+	printf("  biCompression 0x%x ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
+	printf("  biSizeImage %d\n", output_bih->biSizeImage);
 //  }
 
   output_bih->biWidth=input_bih->biWidth;
@@ -165,13 +165,13 @@
   mp_msg(MSGT_WIN32,MSGL_V,"ICCompressBegin OK\n");
 
     printf(" Output format after query/begin:\n");
-	printf("  biSize %ld\n", output_bih->biSize);
-	printf("  biWidth %ld\n", output_bih->biWidth);
-	printf("  biHeight %ld\n", output_bih->biHeight);
+	printf("  biSize %d\n", output_bih->biSize);
+	printf("  biWidth %d\n", output_bih->biWidth);
+	printf("  biHeight %d\n", output_bih->biHeight);
 	printf("  biPlanes %d\n", output_bih->biPlanes);
 	printf("  biBitCount %d\n", output_bih->biBitCount);
-	printf("  biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
-	printf("  biSizeImage %ld\n", output_bih->biSizeImage);
+	printf("  biCompression 0x%x ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
+	printf("  biSizeImage %d\n", output_bih->biSizeImage);
   
   encoder_buf_size=input_bih->biSizeImage;
   encoder_buf=malloc(encoder_buf_size);

Index: ve_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ve_xvid.c	3 Nov 2002 15:43:16 -0000	1.4
+++ ve_xvid.c	6 Nov 2002 23:54:24 -0000	1.5
@@ -50,6 +50,7 @@
 };
 
 extern char* passtmpfile;
+extern void mencoder_write_chunk(aviwrite_stream_t *s,int len,unsigned int flags);
 
 static int xvidenc_pass = 0;
 static int xvidenc_quality = sizeof(divx4_motion_presets) / sizeof(divx4_motion_presets[0]) - 1; /* best quality */

Index: vf_1bpp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_1bpp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vf_1bpp.c	22 Oct 2002 16:24:23 -0000	1.2
+++ vf_1bpp.c	6 Nov 2002 23:54:24 -0000	1.3
@@ -165,7 +165,6 @@
 }
 
 static int open(vf_instance_t *vf, char* args){
-    unsigned int i;
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;

Index: vf_2xsai.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_2xsai.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vf_2xsai.c	25 Oct 2002 16:49:33 -0000	1.1
+++ vf_2xsai.c	6 Nov 2002 23:54:24 -0000	1.2
@@ -130,7 +130,6 @@
 		   uint8 *dst, uint32 dst_pitch,
 		   uint32 width, uint32 height, int sbpp) {
 
-	int j;
 	unsigned int x, y;
 	unsigned long color[16];
 

Index: vf_boxblur.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_boxblur.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vf_boxblur.c	31 Oct 2002 23:26:11 -0000	1.1
+++ vf_boxblur.c	6 Nov 2002 23:54:24 -0000	1.2
@@ -177,7 +177,6 @@
 }
 
 static int open(vf_instance_t *vf, char* args){
-	char *pos, *max;
 	int e;
 
 	vf->config=config;

Index: vf_il.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_il.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_il.c	2 Nov 2002 17:43:42 -0000	1.3
+++ vf_il.c	6 Nov 2002 23:54:24 -0000	1.4
@@ -49,7 +49,7 @@
 
 /***************************************************************************/
 
-static int interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int interleave, int swap){
+static void interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int interleave, int swap){
 	const int a= swap;
 	const int b= 1-a;
 	const int m= h>>1;
@@ -124,7 +124,6 @@
 }
 
 static int open(vf_instance_t *vf, char* args){
-	char *pos, *max;
 
 	vf->put_image=put_image;
 //	vf->get_image=get_image;

Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vf_pp.c	2 Nov 2002 14:20:03 -0000	1.19
+++ vf_pp.c	6 Nov 2002 23:54:24 -0000	1.20
@@ -8,6 +8,10 @@
 #include "../mp_msg.h"
 #include "../cpudetect.h"
 
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"

More information about the MPlayer-cvslog mailing list