Commit 0db4cb52 authored by Jan Schmidt's avatar Jan Schmidt

gst/matroska/: Fix the Forte build by making function declaration signatures...

gst/matroska/: Fix the Forte build by making function declaration signatures match the implementations.

Original commit message from CVS:
* gst/matroska/ebml-read.c: (gst_ebml_read_seek):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_handle_seek_event),
(gst_matroska_demux_parse_contents_seekentry),
(gst_matroska_demux_loop):
Fix the Forte build by making function declaration signatures
match the implementations.
parent 0525a5d2
2008-04-09 Jan Schmidt <Jan.Schmidt@sun.com>
* gst/matroska/ebml-read.c: (gst_ebml_read_seek):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_handle_seek_event),
(gst_matroska_demux_parse_contents_seekentry),
(gst_matroska_demux_loop):
Fix the Forte build by making function declaration signatures
match the implementations.
2008-04-08 Tim-Philipp Müller <tim at centricular dot net>
* sys/oss/gstosshelper.c: (gst_oss_helper_rate_check_rate):
......
common @ d3ace35f
Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b
Subproject commit d3ace35f57dd196a3e83a0a48f1350ca32db8e39
......@@ -39,9 +39,9 @@ static GstStateChangeReturn gst_ebml_read_change_state (GstElement * element,
GstStateChange transition);
/* convenience functions */
static gboolean gst_ebml_read_peek_bytes (GstEbmlRead * ebml, guint size,
static GstFlowReturn gst_ebml_read_peek_bytes (GstEbmlRead * ebml, guint size,
GstBuffer ** p_buf, guint8 ** bytes);
static gboolean gst_ebml_read_pull_bytes (GstEbmlRead * ebml, guint size,
static GstFlowReturn gst_ebml_read_pull_bytes (GstEbmlRead * ebml, guint size,
GstBuffer ** p_buf, guint8 ** bytes);
......@@ -447,15 +447,15 @@ gst_ebml_read_get_length (GstEbmlRead * ebml)
* Seek to a given offset.
*/
gboolean
GstFlowReturn
gst_ebml_read_seek (GstEbmlRead * ebml, guint64 offset)
{
if (offset >= gst_ebml_read_get_length (ebml))
return FALSE;
return GST_FLOW_UNEXPECTED;
ebml->offset = offset;
return TRUE;
return GST_FLOW_OK;
}
/*
......
......@@ -1431,8 +1431,8 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux,
}
/* seek (relative to matroska segment) */
if (!gst_ebml_read_seek (GST_EBML_READ (demux),
entry->pos + demux->ebml_segment_start)) {
if (gst_ebml_read_seek (GST_EBML_READ (demux),
entry->pos + demux->ebml_segment_start) != GST_FLOW_OK) {
GST_DEBUG ("Failed to seek to offset %" G_GUINT64_FORMAT,
entry->pos + demux->ebml_segment_start);
goto seek_error;
......@@ -3131,7 +3131,8 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux,
}
/* seek */
if (!gst_ebml_read_seek (ebml, seek_pos + demux->ebml_segment_start))
if (gst_ebml_read_seek (ebml, seek_pos + demux->ebml_segment_start) !=
GST_FLOW_OK)
return GST_FLOW_ERROR;
/* we don't want to lose our seekhead level, so we add
......@@ -3473,7 +3474,7 @@ pause:
gst_matroska_demux_send_event (demux, gst_event_new_eos ());
}
} else {
GST_ELEMENT_ERROR (demux, STREAM, FAILED, NULL,
GST_ELEMENT_ERROR (demux, STREAM, FAILED, (NULL),
("stream stopped, reason %s", reason));
gst_matroska_demux_send_event (demux, gst_event_new_eos ());
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment