diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/matroska/matroska-demux.c | 5 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2008-08-21 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * gst/matroska/matroska-demux.c: + (gst_matroska_demux_parse_blockgroup_or_simpleblock): + Allow zero sized blocks instead of returning GST_FLOW_OK. Such blocks + are used for text/plain subtitles as a gap-filler in some files. + 2008-08-21 Wim Taymans <wim.taymans@collabora.co.uk> * sys/v4l2/gstv4l2src.c: (gst_v4l2src_v4l2fourcc_to_structure), diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 42ef2703..0179b4ed 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -3904,7 +3904,7 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, /* fetch stream from num */ stream_num = gst_matroska_demux_stream_from_num (demux, num); - if (size <= 3 || stream_num < 0 || stream_num >= demux->num_streams) { + if (size < 3 || stream_num < 0 || stream_num >= demux->num_streams) { gst_buffer_unref (buf); buf = NULL; GST_WARNING_OBJECT (demux, "Invalid stream %d or size %u", stream_num, @@ -4135,9 +4135,6 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, GstBuffer *sub; GstClockTimeDiff diff; - if (lace_size[n] == 0) - continue; - sub = gst_buffer_create_sub (buf, GST_BUFFER_SIZE (buf) - size, lace_size[n]); |