[Mplayer-cvslog] CVS: main codec-cfg.c,1.39,1.40 demux_avi.c,1.29,1.30 demuxer.c,1.30,1.31 open.c,1.14,1.15 stream.c,1.17,1.18 subreader.h,1.7,1.8

[Arpi of Ize]

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

Modified Files:
	codec-cfg.c demux_avi.c demuxer.c open.c stream.c subreader.h 
Log Message:
-Wall warnings fixed

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- codec-cfg.c	27 Sep 2001 13:19:46 -0000	1.39
+++ codec-cfg.c	2 Oct 2001 21:45:40 -0000	1.40
@@ -645,7 +645,7 @@
 }
 
 void list_codecs(int audioflag){
-	int i, j;
+	int i;
 	codecs_t *c;
 
 		if (audioflag) {
@@ -657,7 +657,7 @@
 			c = video_codecs;
 			printf("vc:      vfm: status:   info:  [lib/dll]\n");
 		}
-		if(!i) return NULL;
+		if(!i) return;
 		for (/* NOTHING */; i--; c++) {
 			char* s="unknown ";
 			switch(c->status){

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_avi.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- demux_avi.c	27 Sep 2001 20:36:19 -0000	1.29
+++ demux_avi.c	2 Oct 2001 21:45:40 -0000	1.30
@@ -359,6 +359,8 @@
 extern int force_ni;
 extern int pts_from_bps;
 
+void read_avi_header(demuxer_t *demuxer,int index_mode);
+
 demuxer_t* demux_open_avi(demuxer_t* demuxer){
     demux_stream_t *d_audio=demuxer->audio;
     demux_stream_t *d_video=demuxer->video;

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/demuxer.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- demuxer.c	26 Sep 2001 21:35:14 -0000	1.30
+++ demuxer.c	2 Oct 2001 21:45:40 -0000	1.31
@@ -341,6 +341,9 @@
 int asf_check_header(demuxer_t *demuxer);
 int read_asf_header(demuxer_t *demuxer);
 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id);
+demuxer_t* demux_open_avi(demuxer_t* demuxer);
+int mov_check_file(demuxer_t* demuxer);
+int mov_read_header(demuxer_t* demuxer);
 
 
 demuxer_t* demux_open(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/open.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- open.c	27 Sep 2001 00:19:07 -0000	1.14
+++ open.c	2 Oct 2001 21:45:40 -0000	1.15
@@ -113,7 +113,7 @@
 //============ Open DVD title ==============
 #ifdef USE_DVDREAD
 if(dvd_title){
-  int ret,ret2;
+//  int ret,ret2;
   dvd_priv_t *d;
     int ttn,pgc_id,pgn;
     dvd_reader_t *dvd;
@@ -297,7 +297,6 @@
     
     if( d->cur_pgc->cell_playback[ next_cell ].block_type
                                         == BLOCK_TYPE_ANGLE_BLOCK ) {
-	    int i;
 	    while(next_cell<d->cur_pgc->nr_of_cells){
                 if( d->cur_pgc->cell_playback[next_cell].block_mode
                                           == BLOCK_MODE_LAST_CELL ) break;

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/stream.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- stream.c	27 Sep 2001 20:36:53 -0000	1.17
+++ stream.c	2 Oct 2001 21:45:41 -0000	1.18
@@ -67,16 +67,6 @@
 
 //  if(verbose>=3) printf("seek to 0x%X\n",(unsigned int)pos);
 
-if(verbose>=3){
-#ifdef _LARGEFILE_SOURCE
-  printf("s->pos=%llX  newpos=%llX  new_bufpos=%llX  buflen=%X  \n",
-    (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
-#else
-  printf("s->pos=%X  newpos=%X  new_bufpos=%X  buflen=%X  \n",
-    (unsigned int)s->pos,newpos,pos,s->buf_len);
-#endif
-}
-
   s->buf_pos=s->buf_len=0;
 
   switch(s->type){
@@ -92,6 +82,16 @@
   case STREAMTYPE_DVD:
     newpos=pos/2048; newpos*=2048; break;
   }
+
+if(verbose>=3){
+#ifdef _LARGEFILE_SOURCE
+  printf("s->pos=%llX  newpos=%llX  new_bufpos=%llX  buflen=%X  \n",
+    (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
+#else
+  printf("s->pos=%X  newpos=%X  new_bufpos=%X  buflen=%X  \n",
+    (unsigned int)s->pos,newpos,pos,s->buf_len);
+#endif
+}
 
   pos-=newpos;
 

Index: subreader.h
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subreader.h	31 May 2001 18:08:24 -0000	1.7
+++ subreader.h	2 Oct 2001 21:45:41 -0000	1.8
@@ -25,5 +25,6 @@
 
 subtitle* sub_read_file (char *filename);
 char * sub_filename(char *path, char * fname );
+void list_sub_file(subtitle* subs);
 
 #endif