Merge remote-tracking branch 'upstream/master' into tizen

[platform/upstream/gstreamer.git] / gst / gstutils.h

diff --git a/gst/gstutils.h b/gst/gstutils.h
index 2957569..daf84df 100644 (file)
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -1059,6 +1059,11 @@ gboolean                gst_element_query_duration      (GstElement *element, Gs
 GST_API
 gboolean                gst_element_query_convert       (GstElement *element, GstFormat src_format, gint64 src_val,
                                                          GstFormat dest_format, gint64 *dest_val);
+#ifdef TIZEN_PROFILE_TV
+GST_API
+gboolean                gst_element_query_resource      (GstElement *element, GList **resource_list);
+#endif
+
 
 /* pad functions */
 
@@ -1225,6 +1230,9 @@ void          gst_type_mark_as_plugin_api       (GType type, GstPluginAPIFlags f
 GST_API
 gboolean      gst_type_is_plugin_api            (GType type, GstPluginAPIFlags *flags);
 
+#ifdef TIZEN_PROFILE_TV
+void          gst_set_family_id_to_child        (GstElement* child, int id);
+#endif
 G_END_DECLS
 
 #endif /* __GST_UTILS_H__ */