Merge branch 'master' into 0.11

Conflicts:
	docs/gst/gstreamer-sections.txt
	gst/gstelementfactory.c
	gst/gstminiobject.c

docs/gst/gstreamer-sections.txt

@@ -320,6 +320,7 @@ gst_buffer_list_get_type
 <TITLE>GstCaps</TITLE>
 GstCaps
 GstStaticCaps
+GstCapsIntersectMode
 
 GstCapsFlags
 GST_CAPS_ANY
@@ -359,6 +360,7 @@ gst_caps_is_always_compatible
 gst_caps_is_subset
 gst_caps_can_intersect
 gst_caps_intersect
+gst_caps_intersect_full
 gst_caps_union
 gst_caps_normalize
 gst_caps_do_simplify
@@ -375,9 +377,11 @@ GST_CAPS
 GST_IS_CAPS
 GST_TYPE_CAPS
 GST_TYPE_CAPS_FLAGS
+GST_TYPE_CAPS_INTERSECT_MODE
 <SUBSECTION Private>
 gst_caps_flags_get_type
 gst_caps_get_type
+gst_caps_intersect_mode_get_type
 </SECTION>
 
 <SECTION>
@@ -702,6 +706,10 @@ gst_element_factory_create
 gst_element_factory_make
 gst_element_factory_can_sink_caps
 gst_element_factory_can_src_caps
+gst_element_factory_can_sink_all_caps
+gst_element_factory_can_src_all_caps
+gst_element_factory_can_sink_any_caps
+gst_element_factory_can_src_any_caps
 gst_element_factory_get_static_pad_templates
 GstElementFactoryListType
 GST_ELEMENT_FACTORY_TYPE_ANY
@@ -1804,7 +1812,9 @@ gst_parse_context_get_missing_elements
 <SUBSECTION Standard>
 GST_TYPE_PARSE_ERROR
 GST_TYPE_PARSE_FLAGS
+GST_TYPE_PARSE_CONTEXT
 <SUBSECTION Private>
+gst_parse_context_get_type
 gst_parse_error_get_type
 gst_parse_flags_get_type
 </SECTION>
@@ -2728,7 +2738,6 @@ gst_date_time_get_time_zone_offset
 gst_date_time_get_second
 gst_date_time_get_year
 gst_date_time_new
-gst_date_time_new_from_unix_epoch
 gst_date_time_new_from_unix_epoch_local_time
 gst_date_time_new_from_unix_epoch_utc
 gst_date_time_new_local_time

docs/libs/gstreamer-libs-sections.txt

@@ -229,6 +229,7 @@ gst_base_parse_set_frame_rate
 gst_base_parse_convert_default
 gst_base_parse_add_index_entry
 
+GstBaseParseFrame
 GstBaseParseFrameFlags
 gst_base_parse_frame_new
 gst_base_parse_frame_init
@@ -236,6 +237,13 @@ gst_base_parse_frame_free
 
 gst_base_parse_push_frame
 
+GST_BASE_PARSE_DRAINING
+GST_BASE_PARSE_FLAG_DRAINING
+GST_BASE_PARSE_FLAG_LOST_SYNC
+GST_BASE_PARSE_FLOW_DROPPED
+GST_BASE_PARSE_FLOW_QUEUED
+GST_BASE_PARSE_LOST_SYNC
+GST_BASE_PARSE_SINK_PAD
 GST_BASE_PARSE_SRC_PAD
 <SUBSECTION Standard>
 GstBaseParsePrivate

gst/gstatomicqueue.h

@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 
 /**
  * GstAtomicQueue:
+ *
  * Opaque atomic data queue.
  *
  * Use the acessor functions to get the stored values.

gst/gstbufferlist.c

@@ -40,7 +40,6 @@
 
 /**
  * GstBufferList:
- * @mini_object: the parent structure
  *
  * Opaque list of grouped buffers.
  *

gst/gstcaps.h

@@ -53,19 +53,20 @@ typedef enum {
  *
  * Modes of caps intersection
  *
- * #GST_CAPS_INTERSECT_ZIG_ZAG tries to preserve overall order of both caps
+ * @GST_CAPS_INTERSECT_ZIG_ZAG tries to preserve overall order of both caps
  * by iterating on the caps' structures as the following matrix shows:
+ * |[
  *          caps1
  *       +-------------
  *       | 1  2  4  7
  * caps2 | 3  5  8 10
  *       | 6  9 11 12
- *
+ * ]|
  * Used when there is no explicit precedence of one caps over the other. e.g.
  * tee's sink pad getcaps function, it will probe its src pad peers' for their
  * caps and intersect them with this mode.
  *
- * #GST_CAPS_INTERSECT_FIRST is useful when an element wants to preserve
+ * @GST_CAPS_INTERSECT_FIRST is useful when an element wants to preserve
  * another element's caps priority order when intersecting with its own caps.
  * Example: If caps1 is [A, B, C] and caps2 is [E, B, D, A], the result
  * would be [A, B], maintaining the first caps priority on the intersection.

gst/gstelement.c

@@ -190,7 +190,7 @@ gst_element_class_init (GstElementClass * klass)
    * usually be emitted from the context of the streaming thread. Also keep in
    * mind that if you add new elements to the pipeline in the signal handler
    * you will need to set them to the desired target state with
-   * gst_element_set() or gst_element_sync_state_with_parent().
+   * gst_element_set_state() or gst_element_sync_state_with_parent().
    */
   gst_element_signals[PAD_ADDED] =
       g_signal_new ("pad-added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,

gst/gstelement.h

@@ -712,6 +712,8 @@ GType                   gst_element_get_type            (void);
  * gst_element_get_parent:
  * @elem: a #GstElement to get the parent of.
  *
+ * Get the parent of an element.
+ *
  * Returns: (transfer full): the parent of an element.
  */
 #define                 gst_element_get_parent(elem)    gst_object_get_parent(GST_OBJECT_CAST(elem))

gst/gstpluginfeature.h

@@ -142,6 +142,15 @@ void            gst_plugin_feature_list_free            (GList *list);
 GList          *gst_plugin_feature_list_copy            (GList *list);
 void            gst_plugin_feature_list_debug           (GList *list);
 
+/**
+ * GST_PLUGIN_FEATURE_LIST_DEBUG:
+ * @list: (transfer none) (element-type Gst.PluginFeature): a #GList of
+ *     plugin features
+ *
+ * Debug the plugin feature names in @list.
+ *
+ * Since: 0.10.31
+ */
 #ifndef GST_DISABLE_GST_DEBUG
 #define GST_PLUGIN_FEATURE_LIST_DEBUG(list) gst_plugin_feature_list_debug(list)
 #else

gst/gstsystemclock.h

@@ -57,7 +57,6 @@ typedef enum {
 
 /**
  * GstSystemClock:
- * @clock: The parent clock
  *
  * The default implementation of a #GstClock that uses the system time.
  */

libs/gst/base/gstbaseparse.c

@@ -2990,7 +2990,7 @@ gst_base_parse_set_syncable (GstBaseParse * parse, gboolean syncable)
 /**
  * gst_base_parse_set_passthrough:
  * @parse: a #GstBaseParse
- * @passthrough:
+ * @passthrough: %TRUE if parser should run in passthrough mode
  *
  * Set if the nature of the format or configuration does not allow (much)
  * parsing, and the parser should operate in passthrough mode (which only

libs/gst/dataprotocol/dataprotocol.h

@@ -111,6 +111,16 @@ typedef gboolean (*GstDPPacketFromEventFunction) (const GstEvent * event,
 						guint * length,
 						guint8 ** header,
 						guint8 ** payload);
+
+/**
+ * GstDPPacketizer:
+ * @version: the #GstDPVersion of the protocol to be used
+ * @header_from_buffer: buffer serializer function
+ * @packet_from_caps: caps serializer function
+ * @packet_from_event: event serializer function
+ *
+ * Data protocol packetizer handle.
+ */
 typedef struct {
   GstDPVersion version;
 

plugins/elements/gstfunnel.c

@@ -24,7 +24,6 @@
 
 /**
  * SECTION:element-funnel
- * @short_description: N-to-1 simple funnel
  *
  * Takes packets from various input sinks into one output source.
  *

tests/check/gst/gstminiobject.c

@@ -402,6 +402,23 @@ GST_START_TEST (test_value_collection)
 GST_END_TEST;
 
 
+GST_START_TEST (test_dup_null_mini_object)
+{
+  GValue value = { 0, };
+  GstMiniObject *mo;
+
+  g_value_init (&value, GST_TYPE_BUFFER);
+
+  g_value_set_boxed (&value, NULL);
+
+  mo = GST_MINI_OBJECT_CAST (g_value_dup_boxed (&value));
+  g_assert (mo == NULL);
+
+  g_value_unset (&value);
+}
+
+GST_END_TEST;
+
 static Suite *
 gst_mini_object_suite (void)
 {
@@ -419,6 +436,7 @@ gst_mini_object_suite (void)
   tcase_add_test (tc_chain, test_unref_threaded);
   //tcase_add_test (tc_chain, test_recycle_threaded);
   tcase_add_test (tc_chain, test_value_collection);
+  tcase_add_test (tc_chain, test_dup_null_mini_object);
   return s;
 }