diff libmpdemux/demux_avi.c @ 2314:d0e1c32ad432

libdemux cleanup part 1

--- a/libmpdemux/demux_avi.c	Sat Oct 20 19:14:06 2001 +0000
+++ b/libmpdemux/demux_avi.c	Sat Oct 20 20:03:10 2001 +0000
@@ -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;