docs: add GstFlowCombiner

diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml
index 92d25fb..ce87695 100644 (file)
--- a/docs/libs/gstreamer-libs-docs.sgml
+++ b/docs/libs/gstreamer-libs-docs.sgml
@@ -44,6 +44,7 @@
       <xi:include href="xml/gstbytereader.xml" />
       <xi:include href="xml/gstbytewriter.xml" />
       <xi:include href="xml/gstcollectpads.xml" />
+      <xi:include href="xml/gstflowcombiner.xml" />
       <xi:include href="xml/gsttypefindhelper.xml" />
       <xi:include href="xml/gstdataqueue.xml" />
       <xi:include href="xml/gstqueuearray.xml" />

diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index fbc0a71..78c32c9 100644 (file)
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -760,6 +760,19 @@ gst_collect_pads_get_type
 </SECTION>
 
 <SECTION>
+<FILE>gstflowcombiner</FILE>
+<TITLE>GstFlowCombiner</TITLE>
+<INCLUDE>gst/base/gstflowcombiner.h</INCLUDE>
+gst_flow_combiner_new
+gst_flow_combiner_free
+gst_flow_combiner_update_flow
+gst_flow_combiner_add_pad
+gst_flow_combiner_remove_pad
+<SUBSECTION Standard>
+<SUBSECTION Private>
+</SECTION>
+
+<SECTION>
 <FILE>gstpushsrc</FILE>
 <TITLE>GstPushSrc</TITLE>
 <INCLUDE>gst/base/gstpushsrc.h</INCLUDE>

diff --git a/libs/gst/base/gstflowcombiner.h b/libs/gst/base/gstflowcombiner.h
index 5eecee4..3dcada1 100644 (file)
--- a/libs/gst/base/gstflowcombiner.h
+++ b/libs/gst/base/gstflowcombiner.h
@@ -1,5 +1,4 @@
 /* GStreamer
- * Copyright
  *
  * Copyright (C) 2014 Samsung Electronics. All rights reserved.
  *   Author: Thiago Santos <ts.santos@sisa.samsung.com>
@@ -31,6 +30,13 @@
 
 G_BEGIN_DECLS
 
+/**
+ * GstFlowCombiner:
+ *
+ * Opaque helper structure to aggregate flow returns.
+ *
+ * Since: 1.4
+ */
 typedef struct _GstFlowCombiner GstFlowCombiner;
 
 GstFlowCombiner * gst_flow_combiner_new (void);