Add header for AVI print functions; avoids many forward declarations.

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

13 files changed, 46 insertions, 38 deletions

diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c
index 21d31bd02c..b179515754 100644
--- a/libmpcodecs/ad_acm.c
+++ b/libmpcodecs/ad_acm.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-
+#include "libmpdemux/aviprint.h"
 #include "loader/wineacm.h"
 
 #include "ad_internal.h"
@@ -56,8 +56,6 @@ static int init(sh_audio_t *sh_audio)
   return 1;
 }
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-
 static int preinit(sh_audio_t *sh_audio)
 {
     HRESULT ret;
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
index f387821a5b..823ace89dd 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -23,6 +23,7 @@
 
 #include "ad_internal.h"
 #include "vqf.h"
+#include "libmpdemux/aviprint.h"
 #include "loader/ldt_keeper.h"
 #include "loader/wine/windef.h"
 #include "libaf/af_format.h"
@@ -106,7 +107,6 @@ static int load_dll( char *libname )
      TvqGetNumFixedBitsPerFrame;
 }
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
 static int init_vqf_audio_codec(sh_audio_t *sh_audio){
     WAVEFORMATEX *in_fmt=sh_audio->wf;
     vqf_priv_t*priv=sh_audio->context;
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index 20b0fed6f1..c87f5ef5d9 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -24,7 +24,7 @@
 #include "help_mp.h"
 
 #include "vd_internal.h"
-
+#include "libmpdemux/aviprint.h"
 #include "loader/wine/driver.h"
 #include "loader/wine/vfw.h"
 
@@ -150,8 +150,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
     return CONTROL_UNKNOWN;
 }
 
-void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
-
 // init driver
 static int init(sh_video_t *sh){
     HRESULT ret;
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 1040df540d..f31eda31fd 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -29,6 +29,7 @@
 #include "help_mp.h"
 
 #include "stream/stream.h"
+#include "aviprint.h"
 #include "demuxer.h"
 #include "stheader.h"
 
@@ -135,10 +136,6 @@ int asf_check_header(demuxer_t *demuxer){
   return DEMUXER_TYPE_ASF;
 }
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
-
-
 static int get_ext_stream_properties(char *buf, int buf_len, int stream_num, struct asf_priv* asf, int is_video)
 {
   int pos=0;
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 003874bb2e..25a4f6cef9 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -28,22 +28,12 @@
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-
+#include "aviprint.h"
 #include "aviheader.h"
 #include "libavutil/common.h"
 
 static MainAVIHeader avih;
 
-void print_avih(MainAVIHeader *h, int verbose_level);
-void print_avih_flags(MainAVIHeader *h, int verbose_level);
-void print_strh(AVIStreamHeader *h, int verbose_level);
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
-void print_index(AVIINDEXENTRY *idx,int idx_size, int verbose_level);
-void print_avistdindex_chunk(avistdindex_chunk *h, int verbose_level);
-void print_avisuperindex_chunk(avisuperindex_chunk *h, int verbose_level);
-void print_vprp(VideoPropHeader *vprp, int verbose_level);
-
 static int odml_get_vstream_id(int id, unsigned char res[])
 {
     unsigned char *p = (unsigned char *)&id;
diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c
index f12451a6b4..aa432f54b2 100644
--- a/libmpdemux/aviprint.c
+++ b/libmpdemux/aviprint.c
@@ -29,6 +29,7 @@
 
 #include "aviheader.h"
 #include "ms_hdr.h"
+#include "aviprint.h"
 
 //#include "codec-cfg.h"
 //#include "stheader.h"
diff --git a/libmpdemux/aviprint.h b/libmpdemux/aviprint.h
new file mode 100644
index 0000000000..0f0f6c8e8d
--- /dev/null
+++ b/libmpdemux/aviprint.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_AVIPRINT_H
+#define MPLAYER_AVIPRINT_H
+
+#include "ms_hdr.h"
+#include "aviheader.h"
+
+void print_avih_flags(MainAVIHeader *h, int verbose_level);
+void print_avih(MainAVIHeader *h, int verbose_level);
+void print_strh(AVIStreamHeader *h, int verbose_level);
+void print_wave_header(WAVEFORMATEX *h, int verbose_level);
+void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
+void print_index(AVIINDEXENTRY *idx, int idx_size, int verbose_level);
+void print_avistdindex_chunk(avistdindex_chunk *h, int verbose_level);
+void print_avisuperindex_chunk(avisuperindex_chunk *h, int verbose_level);
+
+#endif /* MPLAYER_AVIPRINT_H */
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 5b38fae206..63b710427d 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "stream/stream.h"
+#include "aviprint.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "genres.h"
@@ -62,8 +63,6 @@ typedef struct mp3_hdr {
   struct mp3_hdr *next;
 } mp3_hdr_t;
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-
 int hr_mp3_seek = 0;
 
 /**
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 979064f079..f70a88146a 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -29,6 +29,7 @@
 #include "av_opts.h"
 
 #include "stream/stream.h"
+#include "aviprint.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "m_option.h"
@@ -80,9 +81,6 @@ typedef struct lavf_priv_t{
     int cur_program;
 }lavf_priv_t;
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
-
 static int mp_read(void *opaque, uint8_t *buf, int size) {
     stream_t *stream = opaque;
     int ret;
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 80bc1d248b..dd8f5e9aab 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -31,6 +31,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 #include "libavutil/intreadwrite.h"
+#include "aviprint.h"
 #include "demux_mov.h"
 #include "demux_ogg.h"
 
@@ -664,9 +665,6 @@ static void demux_ogg_scan_stream(demuxer_t *demuxer)
 
 }
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
-
 static void fixup_vorbis_wf(sh_audio_t *sh, ogg_demuxer_t *od)
 {
   int i, offset;
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 45ee5efdd4..0ce2dfa859 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -45,6 +45,7 @@
 #include "mpbswap.h"
 
 #include "stream/stream.h"
+#include "aviprint.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "demux_real.h"
@@ -1089,8 +1090,6 @@ discard:
   return 0;
 }
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-
 static demuxer_t* demux_open_real(demuxer_t* demuxer)
 {
     real_priv_t* priv = demuxer->priv;
diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c
index fab5672392..dbb1f73ce3 100644
--- a/libmpdemux/demux_realaud.c
+++ b/libmpdemux/demux_realaud.c
@@ -28,6 +28,7 @@
 #include "help_mp.h"
 
 #include "stream/stream.h"
+#include "aviprint.h"
 #include "demuxer.h"
 #include "stheader.h"
 
@@ -157,10 +158,6 @@ static int demux_ra_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds)
 
 
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-
-
-
 static demuxer_t* demux_open_ra(demuxer_t* demuxer)
 {
 	ra_priv_t* ra_priv = demuxer->priv;
diff --git a/mencoder.c b/mencoder.c
index 1265c0b227..93f10324f4 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -66,6 +66,7 @@
 #include "get_path.h"
 
 #include "stream/stream.h"
+#include "libmpdemux/aviprint.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "libmpdemux/mp3_hdr.h"
@@ -369,8 +370,6 @@ static void exit_sighandler(int x){
 
 static muxer_t* muxer=NULL;
 
-void print_wave_header(WAVEFORMATEX *h, int verbose_level);
-
 int main(int argc,char* argv[]){
 
 stream_t* stream=NULL;