[Mplayer-cvslog] CVS: main/libmpdemux demux_mpg.c,1.41,1.42 demuxer.c,1.115,1.116 open.c,1.59,1.60

[Arpi of Ize]

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

Modified Files:
	demux_mpg.c demuxer.c open.c 
Log Message:
some cleanup - made private vars/funcs static, removed obsolete externs


Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- demux_mpg.c	12 Apr 2002 00:47:02 -0000	1.41
+++ demux_mpg.c	29 Sep 2002 19:26:40 -0000	1.42
@@ -335,8 +335,6 @@
   return 1;
 }
 
-//extern off_t seek_to_byte;
-
 void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){
     demux_stream_t *d_audio=demuxer->audio;
     demux_stream_t *d_video=demuxer->video;

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- demuxer.c	22 Sep 2002 14:27:46 -0000	1.115
+++ demuxer.c	29 Sep 2002 19:26:40 -0000	1.116
@@ -496,13 +496,12 @@
 extern int num_mp3audio_packets;
 
 // commandline options, flags:
-//extern int seek_to_byte;
 extern int force_ni;
 extern int pts_from_bps;
 
-extern int audio_id;
-extern int video_id;
-extern int dvdsub_id;
+//extern int audio_id;
+//extern int video_id;
+//extern int dvdsub_id;
 
 int asf_check_header(demuxer_t *demuxer);
 int read_asf_header(demuxer_t *demuxer);

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- open.c	22 Sep 2002 02:33:26 -0000	1.59
+++ open.c	29 Sep 2002 19:26:40 -0000	1.60
@@ -110,7 +110,6 @@
   if(ret2<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (get)\n");return NULL;}
   ret=vcd_seek_to_track(f,vcd_track);
   if(ret<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (seek)\n");return NULL;}
-//  seek_to_byte+=ret;
   mp_msg(MSGT_OPEN,MSGL_V,"VCD start byte position: 0x%X  end: 0x%X\n",ret,ret2);
 #ifdef __FreeBSD__
   if (ioctl (f, CDRIOCSETBLOCKSIZE, &bsize) == -1) {