[Mplayer-cvslog] CVS: main cfgparser.c,1.59,1.60 cpudetect.c,1.20,1.21 mencoder.c,1.183,1.184 mplayer.c,1.609,1.610 sub_cc.c,1.3,1.4 subreader.c,1.75,1.76
Arpi of Ize
arpi at mplayerhq.hu
Thu Nov 7 00:54:54 CET 2002
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv16361
Modified Files:
cfgparser.c cpudetect.c mencoder.c mplayer.c sub_cc.c
subreader.c
Log Message:
*HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik at rangers.eu.org>
Index: cfgparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/cfgparser.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- cfgparser.c 23 Oct 2002 20:04:22 -0000 1.59
+++ cfgparser.c 6 Nov 2002 23:54:21 -0000 1.60
@@ -763,7 +763,7 @@
goto err_missing_param;
if (sscanf(param, sizeof(off_t) == sizeof(int) ?
- "%d%c" : "%lld%c", &tmp_off, &dummy) != 1) {
+ "%d%c" : "%lld%c", &tmp_off, (char *)&dummy) != 1) {
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "parameter must be an integer: %s\n", param);
ret = ERR_OUT_OF_RANGE;
goto out;
Index: cpudetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/cpudetect.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cpudetect.c 20 May 2002 01:00:51 -0000 1.20
+++ cpudetect.c 6 Nov 2002 23:54:21 -0000 1.21
@@ -12,6 +12,7 @@
#ifdef ARCH_X86
#include <stdio.h>
+#include <string.h>
#ifdef __FreeBSD__
#include <sys/types.h>
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- mencoder.c 3 Nov 2002 09:54:49 -0000 1.183
+++ mencoder.c 6 Nov 2002 23:54:21 -0000 1.184
@@ -289,6 +289,7 @@
aviwrite_write_chunk(muxer,s,muxer_f,len,flags);
}
+extern void print_wave_header(WAVEFORMATEX *h);
int main(int argc,char* argv[]){
@@ -684,7 +685,7 @@
mux_a->h.dwScale=mux_a->h.dwSampleSize;
mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec;
}
- printf("audiocodec: framecopy (format=%x chans=%d rate=%d bits=%d bps=%d sample=%d)\n",
+ printf("audiocodec: framecopy (format=%x chans=%d rate=%ld bits=%d bps=%ld sample=%ld)\n",
mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec,
mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize);
break;
@@ -1194,7 +1195,7 @@
mux_a->h.dwRate=mux_a->wf->nAvgBytesPerSec;
mux_a->h.dwScale=1;
mux_a->wf->nBlockAlign=1;
- printf("\n\nCBR audio: %d bytes/sec, %d bytes/block\n",
+ printf("\n\nCBR audio: %ld bytes/sec, %d bytes/block\n",
mux_a->h.dwRate,((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize);
}
#endif
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- mplayer.c 3 Nov 2002 02:02:08 -0000 1.609
+++ mplayer.c 6 Nov 2002 23:54:21 -0000 1.610
@@ -129,6 +129,8 @@
#include "libmpcodecs/dec_video.h"
//#include "libmpcodecs/vf.h"
+extern void vf_list_plugins();
+
//**************************************************************************//
//**************************************************************************//
@@ -380,6 +382,10 @@
current_module=NULL;
}
+
+#ifdef X11_FULLSCREEN
+extern void vo_uninit( void );
+#endif
void exit_player(char* how){
Index: sub_cc.c
===================================================================
RCS file: /cvsroot/mplayer/main/sub_cc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sub_cc.c 22 Sep 2002 02:33:22 -0000 1.3
+++ sub_cc.c 6 Nov 2002 23:54:21 -0000 1.4
@@ -15,6 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "sub_cc.h"
Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- subreader.c 30 Oct 2002 19:26:05 -0000 1.75
+++ subreader.c 6 Nov 2002 23:54:21 -0000 1.76
@@ -243,7 +243,7 @@
char *curptr=current->text[i]=(char *)malloc (len+1);
if (!current->text[i]) return ERR;
//strncpy (current->text[i], line, len); current->text[i][len]='\0';
- for(j; j<len; j++) {
+ for(; j<len; j++) {
/* let's filter html tags ::atmos */
if(line[j]=='>') {
skip=0;
More information about the MPlayer-cvslog
mailing list