RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 11:02:10 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-02-18 00:18:50 +00:00
parent 84da7d44ef
commit 0055441774
13 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpcodecs/ad_acm.c
View File

@ -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;

2
libmpcodecs/ad_twin.c
View File

@ -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;

4
libmpcodecs/vd_vfw.c
View File

@ -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;

5
libmpdemux/asfheader.c
View File

@ -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;

12
libmpdemux/aviheader.c
View File

@ -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;

1
libmpdemux/aviprint.c
View File

@ -29,6 +29,7 @@
#include "aviheader.h"
#include "ms_hdr.h"
#include "aviprint.h"
//#include "codec-cfg.h"
//#include "stheader.h"

34
libmpdemux/aviprint.h Normal file
View File

@ -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 */

3
libmpdemux/demux_audio.c
View File

@ -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;
/**

4
libmpdemux/demux_lavf.c
View File

@ -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;

4
libmpdemux/demux_ogg.c
View File

@ -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;

3
libmpdemux/demux_real.c
View File

@ -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;

5
libmpdemux/demux_realaud.c
View File

@ -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;

3
mencoder.c
View File

@ -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;