diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-20 20:03:10 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-20 20:03:10 +0000 |
| commit | edc63890370a910ffdf64091401f3fa18da61182 (patch) | |
| tree | f38606ba1e84ab1665bbcb539394d3e1f2cb50ec /libmpdemux/demux_avi.c | |
| parent | 9eb9d9fdf626e6c69b421e792424067c774c505b (diff) | |
| download | mpv-edc63890370a910ffdf64091401f3fa18da61182.tar.bz2 mpv-edc63890370a910ffdf64091401f3fa18da61182.tar.xz | |
libdemux cleanup part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2315 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_avi.c')
| -rw-r--r-- | libmpdemux/demux_avi.c | 18 |
1 files changed, 14 insertions, 4 deletions
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; |