summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThijs Vermeir <thijsvermeir@gmail.com>2010-07-02 15:28:41 +0200
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-10-24 11:54:15 +0200
commitc5759cce4ac34f4eff810e0b6e9fd3ce75bdb047 (patch)
tree9e5c70d8878db42c47371ab77e337e51d5cb584d
parentc0006d975bb56f4dd624af1ad66b8777113e41f8 (diff)
mpegdemux: check base_time before calculating new_start0.10
https://bugzilla.gnome.org/show_bug.cgi?id=623387
-rw-r--r--gst/mpegdemux/gstmpegdemux.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index c742a9598..27afa9a2d 100644
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -548,7 +548,8 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
GST_TIME_ARGS (demux->src_segment.last_stop),
GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->current_scr)));
- if (demux->src_segment.last_stop != GST_CLOCK_TIME_NONE) {
+ if (demux->base_time != GST_CLOCK_TIME_NONE
+ && demux->src_segment.last_stop != GST_CLOCK_TIME_NONE) {
GstClockTime new_time = demux->base_time + demux->src_segment.last_stop;
if (stream->last_ts == GST_CLOCK_TIME_NONE || stream->last_ts < new_time) {