common includes moved to private vd_internal.h

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

12 files changed, 9 insertions, 88 deletions

diff --git a/libmpcodecs/vd_cinepak.c b/libmpcodecs/vd_cinepak.c
index f3f600cdda..1c33bb796a 100644
--- a/libmpcodecs/vd_cinepak.c
+++ b/libmpcodecs/vd_cinepak.c
@@ -4,14 +4,6 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_divx4.c b/libmpcodecs/vd_divx4.c
index edb3bed0c8..247d8e7a89 100644
--- a/libmpcodecs/vd_divx4.c
+++ b/libmpcodecs/vd_divx4.c
@@ -9,14 +9,6 @@
 #ifdef USE_DIVX
 #ifdef NEW_DECORE
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c
index 9d44219a11..7b87db0125 100644
--- a/libmpcodecs/vd_dshow.c
+++ b/libmpcodecs/vd_dshow.c
@@ -7,15 +7,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 #include "loader/dshow/DS_VideoDecoder.h"
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index ec3f5f6376..f226e4c5a6 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -10,14 +10,6 @@
 
 #include "bswap.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h
index 72438604af..fab858b004 100644
--- a/libmpcodecs/vd_internal.h
+++ b/libmpcodecs/vd_internal.h
@@ -1,4 +1,13 @@
 
+#include "codec-cfg.h"
+#include "../libvo/img_format.h"
+
+#include "stream.h"
+#include "demuxer.h"
+#include "stheader.h"
+
+#include "vd.h"
+
 // prototypes:
 //static vd_info_t info;
 static int control(sh_video_t *sh,int cmd,void* arg,...);
diff --git a/libmpcodecs/vd_null.c b/libmpcodecs/vd_null.c
index bccd2f70bc..b0a1217c6e 100644
--- a/libmpcodecs/vd_null.c
+++ b/libmpcodecs/vd_null.c
@@ -1,16 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "codec-cfg.h"
-
 #include "config.h"
 #include "mp_msg.h"
 
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = 
diff --git a/libmpcodecs/vd_odivx.c b/libmpcodecs/vd_odivx.c
index 7e02e110e5..5591904ad6 100644
--- a/libmpcodecs/vd_odivx.c
+++ b/libmpcodecs/vd_odivx.c
@@ -8,14 +8,6 @@
 
 #ifdef USE_DIVX
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_qtrpza.c b/libmpcodecs/vd_qtrpza.c
index b3ae283237..c1ea74fe3f 100644
--- a/libmpcodecs/vd_qtrpza.c
+++ b/libmpcodecs/vd_qtrpza.c
@@ -4,14 +4,6 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_raw.c b/libmpcodecs/vd_raw.c
index 02c524cce8..666f70b9d0 100644
--- a/libmpcodecs/vd_raw.c
+++ b/libmpcodecs/vd_raw.c
@@ -4,14 +4,6 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_rle.c b/libmpcodecs/vd_rle.c
index 3014f9a6cb..b25e28ab6c 100644
--- a/libmpcodecs/vd_rle.c
+++ b/libmpcodecs/vd_rle.c
@@ -4,14 +4,6 @@
 #include "config.h"
 #include "mp_msg.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index 20053053bc..dfd47bee5b 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -7,14 +7,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 #include "dll_init.h"
diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c
index e0806507fc..85c2ae8929 100644
--- a/libmpcodecs/vd_xanim.c
+++ b/libmpcodecs/vd_xanim.c
@@ -6,14 +6,6 @@
 
 #include "mp_msg.h"
 
-#include "codec-cfg.h"
-#include "../libvo/img_format.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-#include "vd.h"
 #include "vd_internal.h"
 
 static vd_info_t info = {