[Mplayer-cvslog] CVS: main/libmpdemux aviprint.c,1.7,1.8 demux_avi.c,1.30,1.31 demuxer.c,1.34,1.35 open.c,1.15,1.16 parse_es.c,1.5,1.6 test.c,1.1,1.2

[Arpi of Ize]

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

Modified Files:
	aviprint.c demux_avi.c demuxer.c open.c parse_es.c test.c 
Log Message:
libdemux cleanup part 1

Index: aviprint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviprint.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aviprint.c	11 Aug 2001 20:37:33 -0000	1.7
+++ aviprint.c	20 Oct 2001 20:03:10 -0000	1.8
@@ -3,8 +3,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-//extern int verbose; // defined in mplayer.c
-
 #include "stream.h"
 #include "demuxer.h"
 

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- demux_avi.c	2 Oct 2001 21:45:40 -0000	1.30
+++ demux_avi.c	20 Oct 2001 20:03:10 -0000	1.31
@@ -355,9 +355,20 @@
 
 //extern int audio_id;
 //extern int video_id;
-extern int index_mode;  // -1=untouched  0=don't use index  1=use (geneate) index
-extern int force_ni;
-extern int pts_from_bps;
+//extern int index_mode;  // -1=untouched  0=don't use index  1=use (geneate) index
+//extern int force_ni;
+//extern int pts_from_bps;
+
+// AVI demuxer parameters:
+int index_mode=-1;  // -1=untouched  0=don't use index  1=use (geneate) index
+int force_ni=0;     // force non-interleaved AVI parsing
+
+// PTS:  0=interleaved  1=BPS-based
+#ifdef AVI_SYNC_BPS
+int pts_from_bps=1;
+#else
+int pts_from_bps=0;
+#endif
 
 void read_avi_header(demuxer_t *demuxer,int index_mode);
 
@@ -584,7 +595,6 @@
                 len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
                 audio_chunk_pos=i; ++d_audio->pack_no;
                 if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){
-                  //if(verbose)printf("break;\n");
                   break;
                 }
                 d_audio->dpos+=len;

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- demuxer.c	16 Oct 2001 22:41:46 -0000	1.34
+++ demuxer.c	20 Oct 2001 20:03:10 -0000	1.35
@@ -339,7 +339,6 @@
 extern int video_id;
 extern int dvdsub_id;
 
-void read_avi_header(demuxer_t *demuxer,int index_mode);
 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);

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- open.c	2 Oct 2001 21:45:40 -0000	1.15
+++ open.c	20 Oct 2001 20:03:10 -0000	1.16
@@ -275,7 +275,6 @@
        if (len == -1)
 	 perror("Error: lseek failed to obtain video file size");
        else
-        if(verbose)
 #ifdef _LARGEFILE_SOURCE
 	 mp_msg(MSGT_OPEN,MSGL_V,"File size is %lld bytes\n", (long long)len);
 #else

Index: parse_es.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/parse_es.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parse_es.c	26 Sep 2001 21:35:14 -0000	1.5
+++ parse_es.c	20 Oct 2001 20:03:10 -0000	1.6
@@ -4,8 +4,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-extern int verbose; // defined in mplayer.c
-
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.c	20 Oct 2001 18:47:55 -0000	1.1
+++ test.c	20 Oct 2001 20:03:10 -0000	1.2
@@ -23,13 +23,7 @@
 void resync_audio_stream(sh_audio_t *sh_audio){
 }
 
-// some globals:
-int verbose=1;
-
-// AVI demuxer parameters:
-int index_mode=-1;  // -1=untouched  0=don't use index  1=use (geneate) index
-int force_ni=0;     // force non-interleaved AVI parsing
-int pts_from_bps=1; // PTS:  0=interleaved  1=BPS-based
+int verbose=1; // must be global!
 
 //---------------