summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-04 00:26:45 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-04 00:26:45 +0000
commit8b3cdcf5ea4494a39fe9fea36094fac830aa371f (patch)
treea184752685fb4b7cf20e57b7678809fdd3c705ce
parentc6e3de5502df8d58b81a2a8ef9dde51bb88d8b49 (diff)
downloadmpv-8b3cdcf5ea4494a39fe9fea36094fac830aa371f.tar.bz2
mpv-8b3cdcf5ea4494a39fe9fea36094fac830aa371f.tar.xz
using audio.dwStart too... (for baittest.avi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3303 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_avi.c1
-rw-r--r--mplayer.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index ba8e74960c..e812d0bcd7 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -608,6 +608,7 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
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
diff --git a/mplayer.c b/mplayer.c
index fb3cf18444..5368856896 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1559,6 +1559,7 @@ if(!(vo_flags&256)){ // flag 256 means: libvo driver does its timing (dvb card)
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)