mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 22:36:33 +00:00
Handle EOS correctly.
Original commit message from CVS: Handle EOS correctly.
This commit is contained in:
parent
2c45f60b46
commit
7e9f0b9582
2 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2004-08-27 Arwed v. Merkatz <v.merkatz@gmx.net>
|
||||
|
||||
* gst/matroska/ebml-read.c: (gst_ebml_peed_id), (gst_ebml_read_element_id),
|
||||
handle EOS correctly
|
||||
|
||||
2004-08-27 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
patch by: Zaheer Abbas Merali
|
||||
|
|
|
@ -160,8 +160,12 @@ gst_ebml_read_element_id (GstEbmlRead * ebml, guint32 * id, guint * level_up)
|
|||
|
||||
/* Here, we might encounter EOS */
|
||||
gst_bytestream_get_status (ebml->bs, &remaining, &event);
|
||||
if (event) {
|
||||
if (event && GST_IS_EVENT (event)) {
|
||||
gboolean eos = (GST_EVENT_TYPE (event) == GST_EVENT_EOS);
|
||||
|
||||
gst_pad_event_default (ebml->sinkpad, event);
|
||||
if (eos)
|
||||
return FALSE;
|
||||
} else {
|
||||
guint64 pos = gst_bytestream_tell (ebml->bs);
|
||||
|
||||
|
@ -299,7 +303,7 @@ gst_ebml_peek_id (GstEbmlRead * ebml, guint * level_up)
|
|||
|
||||
g_assert (level_up);
|
||||
|
||||
if (gst_ebml_read_element_id (ebml, &id, level_up) < 0)
|
||||
if (gst_ebml_read_element_id (ebml, &id, level_up) <= 0)
|
||||
return 0;
|
||||
|
||||
return id;
|
||||
|
|
Loading…
Reference in a new issue