[Mplayer-cvslog] CVS: main mplayer.c,1.593,1.594

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv24835

Modified Files:
	mplayer.c 
Log Message:
more accurate a_pts calculation in AVI -bps (default) mode


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -r1.593 -r1.594
--- mplayer.c	14 Oct 2002 01:39:17 -0000	1.593
+++ mplayer.c	16 Oct 2002 14:51:15 -0000	1.594
@@ -1668,10 +1668,11 @@
         unsigned int samples=
 //	  (sh_audio->audio.dwSampleSize)?
 //          ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
-          (d_audio->block_no); // <- used for VBR audio
+          ds_tell_block(d_audio); // <- used for VBR audio
 	samples+=sh_audio->audio.dwStart; // offset
         a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
 	delay_corrected=1;
+	a_pts-=(sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
     } else {
       // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
       a_pts=d_audio->pts;