[Mplayer-cvslog] CVS: main mplayer.c,1.668,1.669 subreader.c,1.96,1.97

[Arpi of Ize]

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

Modified Files:
	mplayer.c subreader.c 
Log Message:
compiler warning fixes patch by Dominik Mierzejewski <dominik at rangers.eu.org>


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- mplayer.c	30 Jan 2003 21:42:35 -0000	1.668
+++ mplayer.c	2 Feb 2003 02:42:55 -0000	1.669
@@ -1507,7 +1507,7 @@
 
 current_module="init_video_filters";
 
-sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",video_out);
+sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",(char *)video_out);
 #ifdef HAVE_MENU
 if(use_menu) {
   vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",menu_root);

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- subreader.c	28 Jan 2003 18:45:58 -0000	1.96
+++ subreader.c	2 Feb 2003 02:42:55 -0000	1.97
@@ -246,7 +246,7 @@
     
     while (!current->text[0]) {
 	if (!fgets (line, LINE_LEN, fd)) return NULL;
-	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,&i,&a4,&b1,&b2,&b3,&i,&b4)) < 10)
+	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
 	    continue;
 	current->start = a1*360000+a2*6000+a3*100+a4/10;
 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
@@ -864,7 +864,7 @@
 		{sub_uses_time=0;return SUB_MICRODVD;}
 	if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",     &i, &i, &i, &i, &i, &i, &i, &i)==8)
 		{sub_uses_time=1;return SUB_SUBRIP;}
-	if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i, &i, &i)==10)
+	if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
 		{sub_uses_time=1;return SUB_SUBVIEWER;}
 	if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i))
 		{sub_uses_time=1;return SUB_SUBVIEWER2;}