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

1 files changed, 1 insertions, 1 deletions

diff --git a/mplayer.c b/mplayer.c
index 77129c0949..a0ecc2f0e6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4185,7 +4185,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
 
 if(rel_seek_secs || abs_seek_pos){
   current_module="seek";
-  if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){
+  if(demux_seek(demuxer,rel_seek_secs,audio_delay,abs_seek_pos)){
       // success:
       /* FIXME there should be real seeking for vobsub */
       if(sh_video) sh_video->pts=d_video->pts;