diff options
| -rw-r--r-- | libmpdemux/aviprint.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 18 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 1 | ||||
| -rw-r--r-- | libmpdemux/open.c | 1 | ||||
| -rw-r--r-- | libmpdemux/parse_es.c | 2 | ||||
| -rw-r--r-- | libmpdemux/test.c | 8 | ||||
| -rw-r--r-- | mplayer.c | 11 |
7 files changed, 19 insertions, 24 deletions
diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index c8fdceea15..c2d5c3b910 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -3,8 +3,6 @@ #include <stdlib.h> #include <unistd.h> -//extern int verbose; // defined in mplayer.c - #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 1583371b48..98e64d946d 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -355,9 +355,20 @@ do{ //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 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){ 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; diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index f573ef7860..acc8648cd0 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -339,7 +339,6 @@ extern int audio_id; 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); diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 774e65c32c..a6870c4225 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -275,7 +275,6 @@ if(dvd_title){ 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 diff --git a/libmpdemux/parse_es.c b/libmpdemux/parse_es.c index 310b1c976d..a872bfffee 100644 --- a/libmpdemux/parse_es.c +++ b/libmpdemux/parse_es.c @@ -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" diff --git a/libmpdemux/test.c b/libmpdemux/test.c index ce59b19228..ee05342281 100644 --- a/libmpdemux/test.c +++ b/libmpdemux/test.c @@ -23,13 +23,7 @@ void skip_audio_frame(sh_audio_t *sh_audio){ 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! //--------------- @@ -224,16 +224,13 @@ static int stream_dump_type=0; 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; |