From d95d2cfa1bd2218d2a4dded3249bf4796f65f08b Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Wed, 15 Feb 2012 17:12:09 +0100
Subject: [PATCH] baseparse: tweak some documentation

---
 libs/gst/base/gstbaseparse.c | 6 +++---
 libs/gst/base/gstbaseparse.h | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
index e5576ade72..c4bdc6313d 100644
--- a/libs/gst/base/gstbaseparse.c
+++ b/libs/gst/base/gstbaseparse.c
@@ -656,8 +656,7 @@ gst_base_parse_frame_init (GstBaseParseFrame * frame)
  * then use gst_base_parse_frame_init() to initialise it.
  *
  * Returns: a newly-allocated #GstBaseParseFrame. Free with
- *     gst_base_parse_frame_free() when no longer needed, unless you gave
- *     away ownership to gst_base_parse_push_frame().
+ *     gst_base_parse_frame_free() when no longer needed.
  *
  * Since: 0.10.33
  */
@@ -2163,7 +2162,8 @@ no_caps:
  * If @frame's out_buffer is set, that will be used as subsequent frame data.
  * Otherwise, @size samples will be taken from the input and used for output,
  * and the output's metadata (timestamps etc) will be taken as (optionally)
- * set by the subclass on @frame's (input) buffer.
+ * set by the subclass on @frame's (input) buffer (which is otherwise
+ * ignored for any but the above purpose/information).
  *
  * Note that the latter buffer is invalidated by this call, whereas the
  * caller retains ownership of @frame.
diff --git a/libs/gst/base/gstbaseparse.h b/libs/gst/base/gstbaseparse.h
index 5bef570a92..9d65185de5 100644
--- a/libs/gst/base/gstbaseparse.h
+++ b/libs/gst/base/gstbaseparse.h
@@ -203,10 +203,9 @@ struct _GstBaseParse {
  *                  The frame's input buffer is guaranteed writable,
  *                  whereas the input frame ownership is held by caller
  *                  (so subclass should make a copy if it needs to hang on).
- *                  Input buffer (data) is equally managed by baseclass and should also be
- *                  copied (e.g. gst_buffer_copy_region()) when needed.
- *                  Time metadata will already be set as much as possible by baseclass
- *                  according to upstream information and/or subclass settings,
+ *                  Input buffer (data) is provided by baseclass with as much
+ *                  metadata set as possible by baseclass according to upstream
+ *                  information and/or subclass settings,
  *                  though subclass may still set buffer timestamp and duration
  *                  if desired.
  * @convert:        Optional.