includes cleanup

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2339 b3059339-0415-0410-9bf9-f77b7e298cf2

9 files changed, 6 insertions, 60 deletions

diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index d8349c6499..cb61083b7b 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -12,14 +12,8 @@ extern int verbose; // defined in mplayer.c
 
 #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
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 9cdbbda413..d83cdc2604 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -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 --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index 94787171cb..cea7a83148 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -308,15 +308,8 @@ int demux_asf_fill_buffer(demuxer_t *demux){
     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 --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 9633f5868a..2a1b086a30 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -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 --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 76b85c9473..34b7f35d44 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -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 --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index dc4cc7f438..c9faabc0da 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -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 @@ static unsigned int read_mpeg_timestamp(stream_t *s,int c){
   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 --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index acc8648cd0..c4a44339d8 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -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 --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 0e83c53d84..cb8907bdae 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -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 --git a/libmpdemux/test.c b/libmpdemux/test.c
index 168c21885b..20c47a6cb1 100644
--- a/libmpdemux/test.c
+++ b/libmpdemux/test.c
@@ -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"
 
 //--------------------------