Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 17636:b849a99cdc3c
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.
author | corey |
---|---|
date | Fri, 17 Feb 2006 01:57:41 +0000 |
parents | 6c541a8421ca |
children | 3fe3b2b3a6ce |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Thu Feb 16 22:43:42 2006 +0000 +++ b/libmpdemux/demuxer.c Fri Feb 17 01:57:41 2006 +0000 @@ -859,7 +859,7 @@ } -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 @@ #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);