From 1ab575101ab9e2e250d782b4e104fcca1c1c66b0 Mon Sep 17 00:00:00 2001 From: corey Date: Fri, 17 Feb 2006 01:57:41 +0000 Subject: Second-try commit of this patch. 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8ff2fc747f..b8b0a14ae9 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -859,7 +859,7 @@ demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int } -int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ +int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; sh_audio_t *sh_audio=d_audio->sh; @@ -893,7 +893,7 @@ if(!demuxer->seekable){ #endif if (demuxer->desc->seek) - demuxer->desc->seek(demuxer,rel_seek_secs,flags); + demuxer->desc->seek(demuxer,rel_seek_secs,audio_delay,flags); if (sh_audio) resync_audio_stream(sh_audio); -- cgit v1.2.3