summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files 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;
}