[Mplayer-cvslog] CVS: main cfgparser.c,1.54,1.55 mencoder.c,1.162,1.163 mplayer.c,1.568,1.569 sub_cc.c,1.2,1.3 subreader.c,1.69,1.70

[Arpi of Ize]

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

Modified Files:
	cfgparser.c mencoder.c mplayer.c sub_cc.c subreader.c 
Log Message:
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug


Index: cfgparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/cfgparser.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cfgparser.c	31 Aug 2002 15:04:06 -0000	1.54
+++ cfgparser.c	22 Sep 2002 02:33:21 -0000	1.55
@@ -744,7 +744,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, &dummy) != 1) {
 				mp_msg(MSGT_CFGPARSER, MSGL_ERR, "parameter must be an integer: %s\n", param);
 				ret = ERR_OUT_OF_RANGE;
 				goto out;

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- mencoder.c	22 Sep 2002 00:43:13 -0000	1.162
+++ mencoder.c	22 Sep 2002 02:33:21 -0000	1.163
@@ -66,6 +66,8 @@
 
 #include "fastmemcpy.h"
 
+#include "linux/timer.h"
+
 int vo_doublebuffering=0;
 int vo_directrendering=0;
 int vo_config_count=0;
@@ -110,8 +112,6 @@
 double max_vout_time_usage=0;
 double cur_video_time_usage=0;
 double cur_vout_time_usage=0;
-static double audio_time_usage=0;
-static int total_time_usage_start=0;
 int benchmark=0;
 
 // A-V sync:
@@ -191,7 +191,6 @@
 #endif
 
 static int vo_w=0, vo_h=0;
-static int input_pitch, input_bpp;
 
 //-------------------------- config stuff:
 
@@ -1256,7 +1255,6 @@
 
 static int parse_end_at(struct config *conf, const char* param)
 {
-    int i;
 
     end_at_type = END_AT_NONE;
     

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- mplayer.c	21 Sep 2002 17:23:46 -0000	1.568
+++ mplayer.c	22 Sep 2002 02:33:21 -0000	1.569
@@ -131,6 +131,7 @@
 
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
+//#include "libmpcodecs/vf.h"
 
 //**************************************************************************//
 //**************************************************************************//
@@ -491,7 +492,6 @@
 //char* title="MPlayer";
 
 // movie info:
-int out_fmt=0;
 int eof=0;
 
 int osd_function=OSD_PLAY;

Index: sub_cc.c
===================================================================
RCS file: /cvsroot/mplayer/main/sub_cc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sub_cc.c	25 Jul 2002 16:39:21 -0000	1.2
+++ sub_cc.c	22 Sep 2002 02:33:22 -0000	1.3
@@ -135,7 +135,7 @@
   }
   else if (c1 & 0x10)		// control code / special char
   {
-	  int channel= (c1 & 0x08) >> 3;
+//	  int channel= (c1 & 0x08) >> 3;
 	  c1&=~0x08;
 	  if(data!=lastcode)
 	  {

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- subreader.c	21 Sep 2002 17:23:46 -0000	1.69
+++ subreader.c	22 Sep 2002 02:33:22 -0000	1.70
@@ -53,7 +53,7 @@
 subtitle *sub_read_line_sami(FILE *fd, subtitle *current) {
     static char line[LINE_LEN+1];
     static char *s = NULL, *slacktime_s;
-    char text[LINE_LEN+1], *p, *q;
+    char text[LINE_LEN+1], *p=NULL, *q;
     int state;
 
     current->lines = current->start = current->end = 0;
@@ -566,7 +566,7 @@
 
     next = line,i=0;
     
-    current->text[0]==""; // just to be sure that string is clear
+    current->text[0]=""; // just to be sure that string is clear
     
     while ((next =sub_readtext (next, &(current->text[i])))) {
 	if (current->text[i]==ERR) {return ERR;}
@@ -674,7 +674,7 @@
 subtitle* subcp_recode (subtitle *sub)
 {
 	int l=sub->lines;
-	size_t ileft, oleft, otlen;
+	size_t ileft, oleft;
 	char *op, *ip, *ot;
 
 	while (l){