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)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8031 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 0 insertions, 7 deletions

diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 3a08927a1b..fd25e2c933 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -71,7 +71,6 @@ typedef struct {
   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 @@ typedef struct {
   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 @@ inline static int ds_tell_pts(demux_stream_t *ds){
   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);