summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ts.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-17 01:57:41 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-17 01:57:41 +0000
commit1ab575101ab9e2e250d782b4e104fcca1c1c66b0 (patch)
tree740c93933a4d6c891deccda22ab985c333951981 /libmpdemux/demux_ts.c
parent808ce9a03a6d2f810ab3616c33105a08b987f07c (diff)
downloadmpv-1ab575101ab9e2e250d782b4e104fcca1c1c66b0.tar.bz2
mpv-1ab575101ab9e2e250d782b4e104fcca1c1c66b0.tar.xz
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
Diffstat (limited to 'libmpdemux/demux_ts.c')
-rw-r--r--libmpdemux/demux_ts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 9e73c01408..be3adfcafb 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -3071,7 +3071,7 @@ extern int videobuf_code_len;
extern int sync_video_packet(demux_stream_t *);
extern int skip_video_packet(demux_stream_t *);
-static void demux_seek_ts(demuxer_t *demuxer, float rel_seek_secs, int flags)
+static void demux_seek_ts(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;