From 6da77386e99a511c36df4fde03489bab7f0d1b07 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 2 Dec 2009 13:43:05 +0200 Subject: [PATCH] core: Fix timeline state at start of playback A timeline starting in the middle of a source file resulted in initial playback state not being set up properly. Fix this by forcing an absolute seek to initialize timeline state before playback starts. --- mplayer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mplayer.c b/mplayer.c index 78883b7895..68269544ac 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2924,7 +2924,6 @@ static void build_ordered_chapter_timeline(struct MPContext *mpctx) mpctx->chapters = chapters; mpctx->timeline_part = 0; - mpctx->video_offset = timeline[0].source_start; mpctx->demuxer = timeline[0].source->demuxer; } @@ -3953,7 +3952,8 @@ if(play_n_frames==0){ mpctx->stop_play=PT_NEXT_ENTRY; goto goto_next_file; } -if (seek_to_sec) { +// If there's a timeline force an absolute seek to initialize state +if (seek_to_sec || mpctx->timeline) { seek(mpctx, seek_to_sec, SEEK_ABSOLUTE); end_at.pos += seek_to_sec; } -- 2.11.4.GIT