Mercurial > mplayer.hg
diff libmpdemux/demuxer.h @ 8030:2b39ff3860b7
cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
instead doing it in demux_avi.c, storing private data in priv insteda of
demuxer structs)
author | arpi |
---|---|
date | Sat, 02 Nov 2002 00:45:12 +0000 |
parents | 75c5762e7b55 |
children | ae5a2ae1c349 |
line wrap: on
line diff
--- a/libmpdemux/demuxer.h Sat Nov 02 00:27:57 2002 +0000 +++ b/libmpdemux/demuxer.h Sat Nov 02 00:45:12 2002 +0000 @@ -71,7 +71,6 @@ int eof; // end of demuxed stream? (true if all buffer empty) off_t pos; // position in the input stream (file) off_t dpos; // position in the demuxed stream - off_t block_no; // number of <=block_size length blocks (for VBR mp3) int pack_no; // serial number of packet int flags; // flags of current packet (keyframe etc) //--------------- @@ -87,8 +86,6 @@ int asf_seq; // ---- mov ----- unsigned int ss_mul,ss_div; -// ---- avi ----- - unsigned int block_size; // ---- stream header ---- void* sh; } demux_stream_t; @@ -185,10 +182,6 @@ return (ds->pts_bytes-ds->buffer_size)+ds->buffer_pos; } -inline static off_t ds_tell_block(demux_stream_t *ds){ - return ds->block_no-(ds->buffer_size-ds->buffer_pos)/ds->block_size; -} - int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len); int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len);