Mercurial > mplayer.hg
changeset 2314:d0e1c32ad432
libdemux cleanup part 1
| author | arpi |
|---|---|
| date | Sat, 20 Oct 2001 20:03:10 +0000 |
| parents | 0b87ac046b87 |
| children | c3c73ba53f0e |
| files | libmpdemux/aviprint.c libmpdemux/demux_avi.c libmpdemux/demuxer.c libmpdemux/open.c libmpdemux/parse_es.c libmpdemux/test.c mplayer.c |
| diffstat | 7 files changed, 19 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/aviprint.c Sat Oct 20 19:14:06 2001 +0000 +++ b/libmpdemux/aviprint.c Sat Oct 20 20:03:10 2001 +0000 @@ -3,8 +3,6 @@ #include <stdlib.h> #include <unistd.h> -//extern int verbose; // defined in mplayer.c - #include "stream.h" #include "demuxer.h"
--- a/libmpdemux/demux_avi.c Sat Oct 20 19:14:06 2001 +0000 +++ b/libmpdemux/demux_avi.c Sat Oct 20 20:03:10 2001 +0000 @@ -355,9 +355,20 @@ //extern int audio_id; //extern int video_id; -extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index -extern int force_ni; -extern int pts_from_bps; +//extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index +//extern int force_ni; +//extern int pts_from_bps; + +// AVI demuxer parameters: +int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index +int force_ni=0; // force non-interleaved AVI parsing + +// PTS: 0=interleaved 1=BPS-based +#ifdef AVI_SYNC_BPS +int pts_from_bps=1; +#else +int pts_from_bps=0; +#endif void read_avi_header(demuxer_t *demuxer,int index_mode); @@ -584,7 +595,6 @@ len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength; audio_chunk_pos=i; ++d_audio->pack_no; if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){ - //if(verbose)printf("break;\n"); break; } d_audio->dpos+=len;
--- a/libmpdemux/demuxer.c Sat Oct 20 19:14:06 2001 +0000 +++ b/libmpdemux/demuxer.c Sat Oct 20 20:03:10 2001 +0000 @@ -339,7 +339,6 @@ extern int video_id; extern int dvdsub_id; -void read_avi_header(demuxer_t *demuxer,int index_mode); int asf_check_header(demuxer_t *demuxer); int read_asf_header(demuxer_t *demuxer); demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id);
--- a/libmpdemux/open.c Sat Oct 20 19:14:06 2001 +0000 +++ b/libmpdemux/open.c Sat Oct 20 20:03:10 2001 +0000 @@ -275,7 +275,6 @@ if (len == -1) perror("Error: lseek failed to obtain video file size"); else - if(verbose) #ifdef _LARGEFILE_SOURCE mp_msg(MSGT_OPEN,MSGL_V,"File size is %lld bytes\n", (long long)len); #else
--- a/libmpdemux/parse_es.c Sat Oct 20 19:14:06 2001 +0000 +++ b/libmpdemux/parse_es.c Sat Oct 20 20:03:10 2001 +0000 @@ -4,8 +4,6 @@ #include <stdlib.h> #include <unistd.h> -extern int verbose; // defined in mplayer.c - #include "config.h" #include "mp_msg.h" #include "help_mp.h"
--- a/libmpdemux/test.c Sat Oct 20 19:14:06 2001 +0000 +++ b/libmpdemux/test.c Sat Oct 20 20:03:10 2001 +0000 @@ -23,13 +23,7 @@ void resync_audio_stream(sh_audio_t *sh_audio){ } -// some globals: -int verbose=1; - -// AVI demuxer parameters: -int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index -int force_ni=0; // force non-interleaved AVI parsing -int pts_from_bps=1; // PTS: 0=interleaved 1=BPS-based +int verbose=1; // must be global! //---------------
--- a/mplayer.c Sat Oct 20 19:14:06 2001 +0000 +++ b/mplayer.c Sat Oct 20 20:03:10 2001 +0000 @@ -224,16 +224,13 @@ extern int dvd_title; -int index_mode=-1; // -1=untouched 0=don't use index 1=use (geneate) index -int force_ni=0; +// AVI demuxer params: +extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index +extern int force_ni; +extern int pts_from_bps; static float default_max_pts_correction=-1;//0.01f; static float max_pts_correction=0;//default_max_pts_correction; -#ifdef AVI_SYNC_BPS -int pts_from_bps=1; -#else -int pts_from_bps=0; -#endif float force_fps=0; int force_srate=0;