From 2b6207564c275857d1c52b96ea72a013fd4a1dfd Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 19 Jan 2005 19:31:54 +0000 Subject: [PATCH] gst/matroska/ebml-read.c: Allow for 0-sized buffers. Fixes length query problems in starwars.mkv from the testsuite. Original commit message from CVS: * gst/matroska/ebml-read.c: (gst_ebml_read_buffer): Allow for 0-sized buffers. Fixes length query problems in starwars.mkv from the testsuite. --- ChangeLog | 6 ++++++ gst/matroska/ebml-read.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1a1c6f6375..4dfeef9dc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-19 Ronald S. Bultje + + * gst/matroska/ebml-read.c: (gst_ebml_read_buffer): + Allow for 0-sized buffers. Fixes length query problems in + starwars.mkv from the testsuite. + 2005-01-19 Tim-Philipp Müller * gst/videobox/gstvideobox.c: (gst_video_box_copy_plane_i420), diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c index c9e9828f8a..022d345071 100644 --- a/gst/matroska/ebml-read.c +++ b/gst/matroska/ebml-read.c @@ -500,12 +500,18 @@ gst_ebml_read_buffer (GstEbmlRead * ebml, guint32 * id, GstBuffer ** buf) if ((bytes = gst_ebml_read_element_id (ebml, id, NULL)) < 0) return FALSE; + gst_bytestream_flush_fast (ebml->bs, bytes); if ((bytes = gst_ebml_read_element_length (ebml, &length)) < 0) return FALSE; + gst_bytestream_flush_fast (ebml->bs, bytes); ebml->id_cache = 0; + if (length == 0) { + *buf = gst_buffer_new (); + return TRUE; + } return ((*buf = gst_ebml_read_element_data (ebml, length)) != NULL); }