From 1ab575101ab9e2e250d782b4e104fcca1c1c66b0 Mon Sep 17 00:00:00 2001 From: corey Date: Fri, 17 Feb 2006 01:57:41 +0000 Subject: 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 --- libmpdemux/demux_y4m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux/demux_y4m.c') diff --git a/libmpdemux/demux_y4m.c b/libmpdemux/demux_y4m.c index 2fe784b4a7..58a8afcb9a 100644 --- a/libmpdemux/demux_y4m.c +++ b/libmpdemux/demux_y4m.c @@ -231,7 +231,7 @@ static demuxer_t* demux_open_y4m(demuxer_t* demuxer){ return demuxer; } -static void demux_seek_y4m(demuxer_t *demuxer, float rel_seek_secs, int flags) { +static void demux_seek_y4m(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) { sh_video_t* sh = demuxer->video->sh; y4m_priv_t* priv = demuxer->priv; int rel_seek_frames = sh->fps*rel_seek_secs; -- cgit v1.2.3