Mercurial > mplayer.hg
changeset 30589:df6c41f16b40
Add header for AVI print functions; avoids many forward declarations.
| author | diego |
|---|---|
| date | Thu, 18 Feb 2010 00:18:50 +0000 |
| parents | 4cc35c457d9e |
| children | d218228dc74d |
| files | libmpcodecs/ad_acm.c libmpcodecs/ad_twin.c libmpcodecs/vd_vfw.c libmpdemux/asfheader.c libmpdemux/aviheader.c libmpdemux/aviprint.c libmpdemux/aviprint.h libmpdemux/demux_audio.c libmpdemux/demux_lavf.c libmpdemux/demux_ogg.c libmpdemux/demux_real.c libmpdemux/demux_realaud.c mencoder.c |
| diffstat | 13 files changed, 46 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_acm.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpcodecs/ad_acm.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ return 1; } -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - static int preinit(sh_audio_t *sh_audio) { HRESULT ret;
--- a/libmpcodecs/ad_twin.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpcodecs/ad_twin.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ 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;
--- a/libmpcodecs/vd_vfw.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpcodecs/vd_vfw.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ return CONTROL_UNKNOWN; } -void print_video_header(BITMAPINFOHEADER *h, int verbose_level); - // init driver static int init(sh_video_t *sh){ HRESULT ret;
--- a/libmpdemux/asfheader.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/asfheader.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ 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;
--- a/libmpdemux/aviheader.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/aviheader.c Thu Feb 18 00:18:50 2010 +0000 @@ -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;
--- a/libmpdemux/aviprint.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/aviprint.c Thu Feb 18 00:18:50 2010 +0000 @@ -29,6 +29,7 @@ #include "aviheader.h" #include "ms_hdr.h" +#include "aviprint.h" //#include "codec-cfg.h" //#include "stheader.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/aviprint.h Thu Feb 18 00:18:50 2010 +0000 @@ -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 */
--- a/libmpdemux/demux_audio.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/demux_audio.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ struct mp3_hdr *next; } mp3_hdr_t; -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - int hr_mp3_seek = 0; /**
--- a/libmpdemux/demux_lavf.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/demux_lavf.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ 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;
--- a/libmpdemux/demux_ogg.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/demux_ogg.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ } -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;
--- a/libmpdemux/demux_real.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/demux_real.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ 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;
--- a/libmpdemux/demux_realaud.c Wed Feb 17 23:46:57 2010 +0000 +++ b/libmpdemux/demux_realaud.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 @@ -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;
--- a/mencoder.c Wed Feb 17 23:46:57 2010 +0000 +++ b/mencoder.c Thu Feb 18 00:18:50 2010 +0000 @@ -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 muxer_t* muxer=NULL; -void print_wave_header(WAVEFORMATEX *h, int verbose_level); - int main(int argc,char* argv[]){ stream_t* stream=NULL;