From b2e8d5749be8825b011458d132873ff2be5b68ae Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 23 Nov 2015 16:20:44 +0100 Subject: demux: fix seeking in .ts .ts files (and some other raw streams) are the only files that enable the SEEK_FACTOR code path, which was broken since commit 70df1608. --- demux/demux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux.c b/demux/demux.c index a3d1ecf7c2..20cf30ac57 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1163,7 +1163,7 @@ int demux_seek(demuxer_t *demuxer, double rel_seek_secs, int flags) in->seeking = true; in->seek_flags = flags; in->seek_pts = rel_seek_secs; - if (flags & SEEK_ABSOLUTE) + if ((flags & SEEK_ABSOLUTE) && !(flags & SEEK_FACTOR)) in->seek_pts = MP_ADD_PTS(in->seek_pts, -in->ts_offset); if (!in->threading) -- cgit v1.2.3