From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Wed, 9 Apr 2008 12:02:55 +0000 (+0000)
Subject: gst/matroska/: Fix the Forte build by making function declaration signatures match... 
X-Git-Tag: 1.19.3~509^2~11358
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0db4cb524f09149c85f6ab826fa1646a3c7c40d7;p=platform%2Fupstream%2Fgstreamer.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 41a28f7..2dfa843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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):
diff --git a/common b/common
index fda6da5..d3ace35 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b
+Subproject commit d3ace35f57dd196a3e83a0a48f1350ca32db8e39
diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 5cff520..85f0e50 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -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;
 }
 
 /*
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 039678b..b67d78c 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -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 ());
       }