summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-04 22:17:30 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-04 22:17:30 +0000
commit9db030295bcc24bbf9b84118fe01465840a47c1b (patch)
tree38089cfce1672126ae00fa2a7e3e8efcd286f7ad /libmpdemux
parent0f0278e91a842e58f0e3a847077451cbfc0fe569 (diff)
downloadmpv-9db030295bcc24bbf9b84118fe01465840a47c1b.tar.bz2
mpv-9db030295bcc24bbf9b84118fe01465840a47c1b.tar.xz
hopefully fixed last A-V sync bug, and also fixed largefile bug in debug printf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6641 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_avi.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 81f832f108..4f924cffd4 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -635,15 +635,19 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
int id=((AVIINDEXENTRY *)priv->idx)[i].ckid;
if(avi_stream_id(id)==d_audio->id){
len=((AVIINDEXENTRY *)priv->idx)[i].dwChunkLength;
- audio_chunk_pos=i; ++d_audio->pack_no;
+ ++d_audio->pack_no;
if(d_audio->dpos<=curr_audio_pos && curr_audio_pos<(d_audio->dpos+len)){
break;
}
d_audio->dpos+=len;
}
}
+ audio_chunk_pos=i;
skip_audio_bytes=curr_audio_pos-d_audio->dpos;
+ mp_msg(MSGT_SEEK,MSGL_V,"SEEK: i=%d (max:%d) dpos=%d (wanted:%d) \n",
+ i,chunk_max,(int)d_audio->dpos,curr_audio_pos);
+
} else {
// VBR audio
int chunks=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale;
@@ -705,8 +709,8 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
mp_msg(MSGT_SEEK,MSGL_V,"SEEK: idx=%d (a:%d v:%d) v.skip=%d a.skip=%d/%4.3f \n",
- priv->idx_pos,audio_chunk_pos,video_chunk_pos,
- priv->skip_video_frames,skip_audio_bytes,skip_audio_secs);
+ (int)priv->idx_pos,audio_chunk_pos,video_chunk_pos,
+ (int)priv->skip_video_frames,skip_audio_bytes,skip_audio_secs);
if(skip_audio_bytes){
demux_read_data(d_audio,NULL,skip_audio_bytes);