summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-27 19:48:31 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-27 19:48:31 +0000
commitaba3f4a7ab511d5e6d42cf2ade4c13a8f685ed71 (patch)
treeaed39dc18f9cc3b45e2ca5827c1d1bb5e23aeaae /libmpdemux/demux_mkv.c
parentc6cda7b49e7873d31e436e9af16a2cc54ee30b38 (diff)
downloadmpv-aba3f4a7ab511d5e6d42cf2ade4c13a8f685ed71.tar.bz2
mpv-aba3f4a7ab511d5e6d42cf2ade4c13a8f685ed71.tar.xz
Add audio_delay argument to demux_mkv_seek.
Some uspecified amount of sugary caffeineated liquid to me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17696 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index b026370cbf..e70cc7971d 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2078,7 +2078,7 @@ demux_mkv_open_sub (demuxer_t *demuxer, mkv_track_t *track)
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 @@ demux_mkv_open (demuxer_t *demuxer)
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 @@ demux_mkv_fill_buffer (demuxer_t *demuxer, demux_stream_t *ds)
}
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 */