docs, gst: typo fixes

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

diff --git a/gst/gstpad.h b/gst/gstpad.h
index 8dbbd9f..8990fdc 100644 (file)
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -171,9 +171,9 @@ typedef enum {
  * @ret: a #GstFlowReturn value
  *
  * Macro to test if the given #GstFlowReturn value indicates a
- * successfull result
+ * successful result
  * This macro is mainly used in elements to decide if the processing
- * of a buffer was successfull.
+ * of a buffer was successful.
  *
  * Since: 0.10.7
  *
@@ -184,7 +184,7 @@ typedef enum {
 #define GST_FLOW_IS_SUCCESS(ret) ((ret) >= GST_FLOW_OK)
 #endif
 
-G_CONST_RETURN gchar*  gst_flow_get_name       (GstFlowReturn ret);
+const gchar*           gst_flow_get_name       (GstFlowReturn ret);
 GQuark                 gst_flow_to_quark       (GstFlowReturn ret);
 
 /**
@@ -228,7 +228,7 @@ typedef enum {
  *
  * Since: 0.10.30
  */
-#define GST_PAD_LINK_CHECK_DEFAULT (GST_PAD_LINK_CHECK_HIERARCHY | GST_PAD_LINK_CHECK_CAPS)
+#define GST_PAD_LINK_CHECK_DEFAULT ((GstPadLinkCheck) (GST_PAD_LINK_CHECK_HIERARCHY | GST_PAD_LINK_CHECK_CAPS))
 
 /**
  * GstActivateMode:
@@ -510,7 +510,7 @@ typedef gboolean            (*GstPadAcceptCapsFunction)     (GstPad *pad, GstCaps *caps);
  * @pad: a #GstPad
  * @caps: the #GstCaps to fixate
  *
- * Given possibly unfixed caps @caps, let @pad use its default prefered
+ * Given possibly unfixed caps @caps, let @pad use its default preferred
  * format to make a fixed caps. @caps should be writable. By default this
  * function will pick the first value of any ranges or lists in the caps but
  * elements can override this function to perform other behaviour.
@@ -966,7 +966,7 @@ void                        gst_pad_set_acceptcaps_function         (GstPad *pad, GstPadAcceptCapsFunction a
 void                   gst_pad_set_fixatecaps_function         (GstPad *pad, GstPadFixateCapsFunction fixatecaps);
 void                   gst_pad_set_setcaps_function            (GstPad *pad, GstPadSetCapsFunction setcaps);
 
-G_CONST_RETURN GstCaps*        gst_pad_get_pad_template_caps           (GstPad *pad);
+const GstCaps*         gst_pad_get_pad_template_caps           (GstPad *pad);
 
 /* capsnego function for linked/unlinked pads */
 GstCaps *              gst_pad_get_caps_reffed                 (GstPad * pad);
@@ -1020,10 +1020,8 @@ GstIterator *           gst_pad_iterate_internal_links_default  (GstPad * pad);
 
 /* generic query function */
 void                   gst_pad_set_query_type_function         (GstPad *pad, GstPadQueryTypeFunction type_func);
-G_CONST_RETURN GstQueryType*
-                       gst_pad_get_query_types                 (GstPad *pad);
-G_CONST_RETURN GstQueryType*
-                       gst_pad_get_query_types_default         (GstPad *pad);
+const GstQueryType*    gst_pad_get_query_types                 (GstPad *pad);
+const GstQueryType*    gst_pad_get_query_types_default         (GstPad *pad);
 
 gboolean               gst_pad_query                           (GstPad *pad, GstQuery *query);
 gboolean               gst_pad_peer_query                      (GstPad *pad, GstQuery *query);