summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2018-12-10 16:13:37 +0200
committerTim-Philipp Müller <tim@centricular.com>2019-05-02 09:52:32 +0100
commitd93d62e287113a9f1fe6e4dde35c810dbf04a239 (patch)
tree48396f33c5a8258438dce7adfe0f1a19065ecd99
parent78f35b40ef969c85ecc57ce5a38ba4f7d9acaaf1 (diff)
downloadgstreamer-plugins-bad-d93d62e287113a9f1fe6e4dde35c810dbf04a239.tar.gz
mpegtsmux: Handle zero-sized buffers correctly without going into an infinite loop
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/844
-rw-r--r--gst/mpegtsmux/tsmux/tsmuxstream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c
index 4cbd21770..69a905a5e 100644
--- a/gst/mpegtsmux/tsmux/tsmuxstream.c
+++ b/gst/mpegtsmux/tsmux/tsmuxstream.c
@@ -304,7 +304,7 @@ tsmux_stream_consume (TsMuxStream * stream, guint len)
stream->cur_buffer_consumed += len;
stream->bytes_avail -= len;
- if (stream->cur_buffer_consumed == 0)
+ if (stream->cur_buffer_consumed == 0 && stream->cur_buffer->size != 0)
return;
if (GST_CLOCK_STIME_IS_VALID (stream->cur_buffer->pts)) {