diff options
| author | Thijs Vermeir <thijsvermeir@gmail.com> | 2010-07-02 15:28:41 +0200 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-24 12:01:46 +0200 |
| commit | 1d710ad13aa4e7a8bd8f4c11803848432ef6573b (patch) | |
| tree | 5b7156b003f5993b6fbed6b94e4dedff07ec575b | |
| parent | df12aae15b8bf1c9cc90a7b5501f514ce40626e8 (diff) | |
| download | gstreamer-plugins-bad-1d710ad13aa4e7a8bd8f4c11803848432ef6573b.tar.gz | |
mpegdemux: check base_time before calculating new_start
https://bugzilla.gnome.org/show_bug.cgi?id=623387
| -rw-r--r-- | gst/mpegdemux/gstmpegdemux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c index 2fe6efc0f..bbe03e3d3 100644 --- a/gst/mpegdemux/gstmpegdemux.c +++ b/gst/mpegdemux/gstmpegdemux.c @@ -598,7 +598,8 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream, GST_TIME_ARGS (demux->src_segment.position), GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->current_scr))); - if (demux->src_segment.position != GST_CLOCK_TIME_NONE) { + if (demux->src_segment.position != GST_CLOCK_TIME_NONE && + demux->base_time != GST_CLOCK_TIME_NONE) { GstClockTime new_time = demux->base_time + demux->src_segment.position; if (stream->last_ts == GST_CLOCK_TIME_NONE || stream->last_ts < new_time) { |