summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorEdward Hervey <edward@collabora.com>2014-06-16 07:42:37 +0200
committerEdward Hervey <edward@collabora.com>2014-06-16 07:42:37 +0200
commit1d1d4694889fd78534561829ac504425b63ac2ad (patch)
treead5762ef9d1e602ed2b122266313c11281592578 /gst
parente00815a586c2c5c1e6219d677689b8b916841f70 (diff)
downloadgstreamer-plugins-bad-1d1d4694889fd78534561829ac504425b63ac2ad.tar.gz
tsdemux: Don't overwrite original seek value
In accurate mode, we'll be using start to fill in the seek segment, therefore don't overwrite it with the shifted seek position. https://bugzilla.gnome.org/show_bug.cgi?id=731698
Diffstat (limited to 'gst')
-rw-r--r--gst/mpegtsdemux/tsdemux.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index ef6055b0e..aa717b437 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -811,10 +811,9 @@ gst_ts_demux_do_seek (MpegTSBase * base, GstEvent * event)
/* configure the segment with the seek variables */
GST_DEBUG_OBJECT (demux, "configuring seek");
- start = MAX (0, start - SEEK_TIMESTAMP_OFFSET);
start_offset =
- mpegts_packetizer_ts_to_offset (base->packetizer, start,
- demux->program->pcr_pid);
+ mpegts_packetizer_ts_to_offset (base->packetizer, MAX (0,
+ start - SEEK_TIMESTAMP_OFFSET), demux->program->pcr_pid);
if (G_UNLIKELY (start_offset == -1)) {
GST_WARNING ("Couldn't convert start position to an offset");