[Mplayer-cvslog] CVS: main mplayer.c,1.642,1.643 subreader.h,1.23,1.24 vobsub.c,1.25,1.26

[Arpi of Ize]

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

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


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.642
retrieving revision 1.643
diff -u -r1.642 -r1.643
--- mplayer.c	2 Jan 2003 21:22:50 -0000	1.642
+++ mplayer.c	3 Jan 2003 12:26:15 -0000	1.643
@@ -857,7 +857,7 @@
        next_edl_record->next = NULL;
      } else {
        if( ( edl_fd = fopen( edl_output_filename, "w" ) ) == NULL ) {
-	 printf( "Error opening file [%s] for writing!\n" );
+	 printf( "Error opening file [%s] for writing!\n", edl_output_filename );
 	 edl_output_filename = NULL;
 	 next_edl_record->next = NULL;
        }

Index: subreader.h
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- subreader.h	28 Dec 2002 15:19:34 -0000	1.23
+++ subreader.h	3 Jan 2003 12:26:15 -0000	1.24
@@ -39,6 +39,8 @@
 
 subtitle* sub_read_file (char *filename, float pts);
 subtitle* subcp_recode1 (subtitle *sub);
+void subcp_open (void); /* for demux_ogg.c */
+void subcp_close (void); /* for demux_ogg.c */
 char * sub_filename(char *path, char * fname);
 void list_sub_file(subtitle* subs);
 void dump_srt(subtitle* subs, float fps);

Index: vobsub.c
===================================================================
RCS file: /cvsroot/mplayer/main/vobsub.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- vobsub.c	23 Dec 2002 01:54:58 -0000	1.25
+++ vobsub.c	3 Jan 2003 12:26:15 -0000	1.26
@@ -1161,7 +1161,7 @@
           if ((strncmp(vob->spu_streams[i].id, lang, 2)==0)){
 	    vobsub_id=i;
 	    mp_msg(MSGT_VOBSUB, MSGL_INFO, "Selected VOBSUB language: %d language: %s\n", i, vob->spu_streams[i].id);
-	    return;
+	    return 0;
 	  }
       lang+=2;while (lang[0]==',' || lang[0]==' ') ++lang;
     }