[MPlayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.54,1.55

[Corey Hickey CVS]

CVS change done by Corey Hickey CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv13492/libmpdemux

Modified Files:
	demux_mkv.c 
Log Message:
Add audio_delay argument to demux_mkv_seek.
Some uspecified amount of sugary caffeineated liquid to me.



Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- demux_mkv.c	4 Jan 2006 12:05:15 -0000	1.54
+++ demux_mkv.c	27 Feb 2006 19:48:31 -0000	1.55
@@ -2078,7 +2078,7 @@
   return 0;
 }
 
-static void demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, int flags);
+static void demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags);
 
 /** \brief Given a matroska track number and type, find the id that mplayer would ask for.
  *  \param d The demuxer for which the subtitle id should be returned.
@@ -2351,7 +2351,7 @@
               mkv_d->has_first_tc = 1;
             }
           demux_mkv_seek (demuxer,
-                          mkv_d->chapters[dvd_chapter-1].start/1000.0, 1);
+                          mkv_d->chapters[dvd_chapter-1].start/1000.0, 0.0, 1);
         }
     }
 
@@ -3126,7 +3126,7 @@
 }
 
 static void
-demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, int flags)
+demux_mkv_seek (demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
 {
   free_cached_dps (demuxer);
   if (!(flags & 2))  /* time in secs */