projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aggregator: Assert if the sink/src pad type that is to be used is not a GstAggregator...
[platform/upstream/gstreamer.git]
/
libs
/
gst
/
base
/
gstflowcombiner.c
diff --git
a/libs/gst/base/gstflowcombiner.c
b/libs/gst/base/gstflowcombiner.c
index
9aba81d
..
8b64a46
100644
(file)
--- a/
libs/gst/base/gstflowcombiner.c
+++ b/
libs/gst/base/gstflowcombiner.c
@@
-56,10
+56,13
@@
* * %GST_FLOW_OK: otherwise
*
* %GST_FLOW_ERROR or below, GST_FLOW_NOT_NEGOTIATED and GST_FLOW_FLUSHING are
* * %GST_FLOW_OK: otherwise
*
* %GST_FLOW_ERROR or below, GST_FLOW_NOT_NEGOTIATED and GST_FLOW_FLUSHING are
- * returned immediatel
l
y from the gst_flow_combiner_update_flow() function.
+ * returned immediately from the gst_flow_combiner_update_flow() function.
*
* Since: 1.4
*/
*
* Since: 1.4
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <gst/gst.h>
#include "gstflowcombiner.h"
#include <gst/gst.h>
#include "gstflowcombiner.h"
@@
-72,9
+75,6
@@
struct _GstFlowCombiner
volatile gint ref_count;
};
volatile gint ref_count;
};
-static GstFlowCombiner *gst_flow_combiner_ref (GstFlowCombiner * combiner);
-static void gst_flow_combiner_unref (GstFlowCombiner * combiner);
-
GST_DEBUG_CATEGORY_STATIC (flowcombiner_dbg);
#define GST_CAT_DEFAULT flowcombiner_dbg
GST_DEBUG_CATEGORY_STATIC (flowcombiner_dbg);
#define GST_CAT_DEFAULT flowcombiner_dbg
@@
-121,7
+121,17
@@
gst_flow_combiner_free (GstFlowCombiner * combiner)
gst_flow_combiner_unref (combiner);
}
gst_flow_combiner_unref (combiner);
}
-static GstFlowCombiner *
+/**
+ * gst_flow_combiner_ref:
+ * @combiner: the #GstFlowCombiner to add a reference to.
+ *
+ * Increments the reference count on the #GstFlowCombiner.
+ *
+ * Returns: the #GstFlowCombiner.
+ *
+ * Since: 1.12.1
+ */
+GstFlowCombiner *
gst_flow_combiner_ref (GstFlowCombiner * combiner)
{
g_return_val_if_fail (combiner != NULL, NULL);
gst_flow_combiner_ref (GstFlowCombiner * combiner)
{
g_return_val_if_fail (combiner != NULL, NULL);
@@
-131,7
+141,15
@@
gst_flow_combiner_ref (GstFlowCombiner * combiner)
return combiner;
}
return combiner;
}
-static void
+/**
+ * gst_flow_combiner_unref:
+ * @combiner: the #GstFlowCombiner to unreference.
+ *
+ * Decrements the reference count on the #GstFlowCombiner.
+ *
+ * Since: 1.12.1
+ */
+void
gst_flow_combiner_unref (GstFlowCombiner * combiner)
{
g_return_if_fail (combiner != NULL);
gst_flow_combiner_unref (GstFlowCombiner * combiner)
{
g_return_if_fail (combiner != NULL);