[Mplayer-cvslog] CVS: main/libmpdemux asfheader.c,1.23,1.24 aviheader.c,1.29,1.30 demux_asf.c,1.17,1.18 demux_avi.c,1.32,1.33 demux_mov.c,1.10,1.11 demux_mpg.c,1.32,1.33 demuxer.c,1.35,1.36 stheader.h,1.17,1.18 test.c,1.3,1.4

[Arpi of Ize]

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

Modified Files:
	asfheader.c aviheader.c demux_asf.c demux_avi.c demux_mov.c 
	demux_mpg.c demuxer.c stheader.h test.c 
Log Message:
includes cleanup

Index: asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asfheader.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- asfheader.c	29 Aug 2001 17:39:10 -0000	1.23
+++ asfheader.c	21 Oct 2001 15:47:31 -0000	1.24
@@ -12,14 +12,8 @@
 
 #include "stream.h"
 #include "demuxer.h"
-
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
 #include "stheader.h"
-//#include "aviheader.h"
+
 #include "asf.h"
 
 #ifdef ARCH_X86

Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- aviheader.c	21 Oct 2001 12:18:45 -0000	1.29
+++ aviheader.c	21 Oct 2001 15:47:31 -0000	1.30
@@ -8,14 +8,9 @@
 
 #include "stream.h"
 #include "demuxer.h"
+#include "stheader.h"
 
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
 #include "bswap.h"
-#include "stheader.h"
 #include "aviheader.h"
 
 #define MIN(a,b) (((a)<(b))?(a):(b))

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- demux_asf.c	26 Sep 2001 21:35:13 -0000	1.17
+++ demux_asf.c	21 Oct 2001 15:47:31 -0000	1.18
@@ -308,14 +308,7 @@
     return 0;
 }
 
-
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
 #include "stheader.h"
-
 
 void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){
     demux_stream_t *d_audio=demuxer->audio;

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- demux_avi.c	21 Oct 2001 12:18:45 -0000	1.32
+++ demux_avi.c	21 Oct 2001 15:47:31 -0000	1.33
@@ -10,12 +10,6 @@
 
 #include "stream.h"
 #include "demuxer.h"
-
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
 #include "stheader.h"
 
 #include "aviheader.h"

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demux_mov.c	16 Oct 2001 22:41:46 -0000	1.10
+++ demux_mov.c	21 Oct 2001 15:47:31 -0000	1.11
@@ -18,12 +18,6 @@
 
 #include "stream.h"
 #include "demuxer.h"
-
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
 #include "stheader.h"
 
 #ifdef HAVE_ZLIB

Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- demux_mpg.c	26 Sep 2001 21:35:14 -0000	1.32
+++ demux_mpg.c	21 Oct 2001 15:47:31 -0000	1.33
@@ -13,6 +13,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
+#include "stheader.h"
 
 //#define MAX_PS_PACKETSIZE 2048
 #define MAX_PS_PACKETSIZE (224*1024)
@@ -32,17 +33,6 @@
   mp_dbg(MSGT_DEMUX,MSGL_DBG3,"{%d}",pts);
   return pts;
 }
-
-//static unsigned int packet_start_pos=0;
-
-//extern void *new_sh_audio(demuxer_t *demux,int id);
-//extern void *new_sh_video(demuxer_t *demux,int id);
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
-#include "stheader.h"
 
 static int demux_mpg_read_packet(demuxer_t *demux,int id){
   int d;

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- demuxer.c	20 Oct 2001 20:03:10 -0000	1.35
+++ demuxer.c	21 Oct 2001 15:47:31 -0000	1.36
@@ -13,12 +13,6 @@
 
 #include "stream.h"
 #include "demuxer.h"
-
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
-#include "codec-cfg.h"
 #include "stheader.h"
 
 void free_demuxer_stream(demux_stream_t *ds){

Index: stheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stheader.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- stheader.h	20 Oct 2001 18:47:55 -0000	1.17
+++ stheader.h	21 Oct 2001 15:47:31 -0000	1.18
@@ -1,11 +1,8 @@
 // Stream headers:
 
-/*
-typedef struct {
-  int driver;
-    // codec descriptor from codec.conf
-} codecinfo_t;
-*/
+#include "wine/mmreg.h"
+#include "wine/avifmt.h"
+#include "wine/vfw.h"
 
 #ifdef HAVE_OGGVORBIS
 #include <math.h>

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test.c	20 Oct 2001 23:51:02 -0000	1.3
+++ test.c	21 Oct 2001 15:47:31 -0000	1.4
@@ -7,11 +7,6 @@
 
 #include "stream.h"
 #include "demuxer.h"
-
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-#include "codec-cfg.h"
 #include "stheader.h"
 
 //--------------------------