changeset 3302:e75454b489df

using audio.dwStart too... (for baittest.avi)
author arpi
date Tue, 04 Dec 2001 00:26:45 +0000
parents 308d3031af6b
children 64976b15ee5d
files libmpdemux/demux_avi.c mplayer.c
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_avi.c	Mon Dec 03 22:30:47 2001 +0000
+++ b/libmpdemux/demux_avi.c	Tue Dec 04 00:26:45 2001 +0000
@@ -608,6 +608,7 @@
 	    curr_audio_pos*=align;
 #else
 	    curr_audio_pos=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
+	    curr_audio_pos-=sh_audio->audio.dwStart;
 	    curr_audio_pos*=sh_audio->audio.dwSampleSize;
 #endif
 
--- a/mplayer.c	Mon Dec 03 22:30:47 2001 +0000
+++ b/mplayer.c	Tue Dec 04 00:26:45 2001 +0000
@@ -1559,6 +1559,7 @@
         unsigned int samples=(sh_audio->audio.dwSampleSize)?
           ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
           (d_audio->pack_no); // <- used for VBR audio
+	samples+=sh_audio->audio.dwStart; // offset
         a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
 #else
       if(sh_audio->audio.dwSampleSize)