[Mplayer-cvslog] CVS: main/libmpdemux asf.h,1.7,1.8 asf_streaming.c,1.7,1.8 aviprint.c,1.8,1.9 aviwrite.c,1.3,1.4 demux_mov.c,1.23,1.24 demux_mpg.c,1.33,1.34 demuxer.h,1.16,1.17 dvdauth.h,1.4,1.5 network.c,1.8,1.9 parse_es.c,1.6,1.7 stream.h,1.11,1.12 test.c,1.4,1.5

[Arpi of Ize]

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

Modified Files:
	asf.h asf_streaming.c aviprint.c aviwrite.c demux_mov.c 
	demux_mpg.c demuxer.h dvdauth.h network.c parse_es.c stream.h 
	test.c 
Log Message:
config.h cleanup, few things added to steram/demuxer headers

Index: asf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- asf.h	26 Oct 2001 18:26:05 -0000	1.7
+++ asf.h	30 Oct 2001 17:03:10 -0000	1.8
@@ -1,7 +1,7 @@
 #ifndef __ASF_H
 #define __ASF_H
 
-#include "config.h"	/* for WORDS_BIGENDIAN */
+//#include "config.h"	/* for WORDS_BIGENDIAN */
 #include <inttypes.h>
 #include "bswap.h"
 #ifdef	STREAMING

Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- asf_streaming.c	26 Oct 2001 18:26:06 -0000	1.7
+++ asf_streaming.c	30 Oct 2001 17:03:10 -0000	1.8
@@ -3,6 +3,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "config.h"
+
 #include "url.h"
 #include "http.h"
 #include "asf.h"

Index: aviprint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviprint.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aviprint.c	20 Oct 2001 20:03:10 -0000	1.8
+++ aviprint.c	30 Oct 2001 17:03:10 -0000	1.9
@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "config.h"
+
 #include "stream.h"
 #include "demuxer.h"
 

Index: aviwrite.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviwrite.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aviwrite.c	29 Oct 2001 00:55:15 -0000	1.3
+++ aviwrite.c	30 Oct 2001 17:03:10 -0000	1.4
@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "config.h"
+
 //#include "stream.h"
 //#include "demuxer.h"
 //#include "stheader.h"

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- demux_mov.c	29 Oct 2001 22:41:54 -0000	1.23
+++ demux_mov.c	30 Oct 2001 17:03:10 -0000	1.24
@@ -9,7 +9,6 @@
 #include <unistd.h>
 
 #include "config.h"
-
 #include "mp_msg.h"
 #include "help_mp.h"
 

Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- demux_mpg.c	21 Oct 2001 15:47:31 -0000	1.33
+++ demux_mpg.c	30 Oct 2001 17:03:10 -0000	1.34
@@ -8,12 +8,12 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "config.h"
-#include "dvdauth.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"
+
+#include "dvdauth.h"
 
 //#define MAX_PS_PACKETSIZE 2048
 #define MAX_PS_PACKETSIZE (224*1024)

Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- demuxer.h	23 Oct 2001 13:55:49 -0000	1.16
+++ demuxer.h	30 Oct 2001 17:03:11 -0000	1.17
@@ -1,6 +1,4 @@
 
-#include "config.h"
-
 #define MAX_PACKS 4096
 #define MAX_PACK_BYTES 0x800000
 
@@ -152,6 +150,12 @@
 
 demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid);
 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
+
+// AVI demuxer params:
+extern int index_mode;  // -1=untouched  0=don't use index  1=use (geneate) index
+extern int force_ni;
+extern int pts_from_bps;
+
 
 
 

Index: dvdauth.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/dvdauth.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdauth.h	6 Jun 2001 21:16:21 -0000	1.4
+++ dvdauth.h	30 Oct 2001 17:03:11 -0000	1.5
@@ -1,4 +1,3 @@
-//#include "config.h"
 #ifdef HAVE_LIBCSS
 #ifndef _MPLAYER_CSS_H
 #define _MPLAYER_CSS_H

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- network.c	26 Oct 2001 18:26:06 -0000	1.8
+++ network.c	30 Oct 2001 17:03:11 -0000	1.9
@@ -24,6 +24,8 @@
 #include <errno.h>
 #include <ctype.h>
 
+#include "config.h"
+
 #include "stream.h"
 #include "demuxer.h"
 

Index: parse_es.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/parse_es.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- parse_es.c	20 Oct 2001 20:03:10 -0000	1.6
+++ parse_es.c	30 Oct 2001 17:03:11 -0000	1.7
@@ -10,7 +10,6 @@
 
 #include "stream.h"
 #include "demuxer.h"
-
 #include "parse_es.h"
 
 //static unsigned char videobuffer[MAX_VIDEO_PACKET_SIZE];

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stream.h	21 Oct 2001 18:13:48 -0000	1.11
+++ stream.h	30 Oct 2001 17:03:11 -0000	1.12
@@ -149,5 +149,12 @@
 stream_t* new_stream(int fd,int type);
 void free_stream(stream_t *s);
 stream_t* new_memory_stream(unsigned char* data,int len);
+stream_t* open_stream(char* filename,int vcd_track,int* file_format);
+
+//#ifdef USE_DVDREAD
+extern int dvd_title;
+extern int dvd_chapter;
+extern int dvd_angle;
+//#endif
 
 #endif // __STREAM_H

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- test.c	21 Oct 2001 15:47:31 -0000	1.4
+++ test.c	30 Oct 2001 17:03:11 -0000	1.5
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "config.h"
 #include "mp_msg.h"
 
 #include "stream.h"