# HG changeset patch
# User arpi
# Date 1003679251 0
# Node ID 4f3e8c8ea32f0eb4c9e2fa13d85ce45aed685a10
# Parent  e6d8e9a54afa0ff91b45f64c3d68205ea843df25
includes cleanup

diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/asfheader.c
--- a/libmpdemux/asfheader.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/asfheader.c	Sun Oct 21 15:47:31 2001 +0000
@@ -12,14 +12,8 @@
 
 #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 "stheader.h"
-//#include "aviheader.h"
 #include "asf.h"
 
 #ifdef ARCH_X86
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/aviheader.c
--- a/libmpdemux/aviheader.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/aviheader.c	Sun Oct 21 15:47:31 2001 +0000
@@ -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))
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/demux_asf.c
--- a/libmpdemux/demux_asf.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/demux_asf.c	Sun Oct 21 15:47:31 2001 +0000
@@ -308,15 +308,8 @@
     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;
     demux_stream_t *d_video=demuxer->video;
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/demux_avi.c
--- a/libmpdemux/demux_avi.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/demux_avi.c	Sun Oct 21 15:47:31 2001 +0000
@@ -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"
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/demux_mov.c
--- a/libmpdemux/demux_mov.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/demux_mov.c	Sun Oct 21 15:47:31 2001 +0000
@@ -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
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/demux_mpg.c
--- a/libmpdemux/demux_mpg.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/demux_mpg.c	Sun Oct 21 15:47:31 2001 +0000
@@ -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)
@@ -33,17 +34,6 @@
   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;
   int len;
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/demuxer.c	Sun Oct 21 15:47:31 2001 +0000
@@ -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){
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/stheader.h
--- a/libmpdemux/stheader.h	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/stheader.h	Sun Oct 21 15:47:31 2001 +0000
@@ -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>
diff -r e6d8e9a54afa -r 4f3e8c8ea32f libmpdemux/test.c
--- a/libmpdemux/test.c	Sun Oct 21 15:04:04 2001 +0000
+++ b/libmpdemux/test.c	Sun Oct 21 15:47:31 2001 +0000
@@ -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"
 
 //--------------------------