summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Penquerc'h <vincent.penquerch@collabora.co.uk>2013-07-25 15:06:12 +0100
committerVincent Penquerc'h <vincent.penquerch@collabora.co.uk>2013-07-25 15:06:12 +0100
commit5c82a510d995fb1fab59ccd2bcd3376d2c38405e (patch)
tree8f514e818a2ec0dbe4f9dfa82155190577ee0695
parent1f7fa9be1d5fb619c29fd734c97bbed9c0ea5f36 (diff)
downloadgstreamer-plugins-bad-5c82a510d995fb1fab59ccd2bcd3376d2c38405e.tar.gz
mpegtsmux: avoid using clipped out buffers
If a buffer was entirely clipped out (ie, it's out of the segment entirely), we'll end up with a NULL buffer, which we don't want to process/dereference.
-rw-r--r--gst/mpegtsmux/mpegtsmux.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index 572355906..70d704b5b 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -977,6 +977,7 @@ mpegtsmux_clip_inc_running_time (GstCollectPads * pads,
GST_DEBUG_OBJECT (cdata->pad, "clipping buffer on pad outside segment");
gst_buffer_unref (buf);
*outbuf = NULL;
+ goto beach;
} else {
GST_LOG_OBJECT (cdata->pad, "buffer pts %" GST_TIME_FORMAT " -> %"
GST_TIME_FORMAT " running time",
@@ -1023,6 +1024,7 @@ mpegtsmux_clip_inc_running_time (GstCollectPads * pads,
gst_buffer_unref (buf);
}
+beach:
return GST_FLOW_OK;
}