From 976b9750ea7a2bdd467e65b2500ae2a5d0afe7a9 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 20 Aug 2008 07:22:11 +0000 Subject: [PATCH] gst/gstutils.c: Mention that this is just like gst_buffer_merge() but with extra unreffing for C coders. Advise langu... Original commit message from CVS: patch by: Murray Cumming * gst/gstutils.c: Mention that this is just like gst_buffer_merge() but with extra unreffing for C coders. Advise language bindings not to wrap it. Fixes Bug #533856. Also fix file comment. --- ChangeLog | 11 +++++++++++ gst/gstutils.c | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ce885a017c..5ccb0ea031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-08-20 Stefan Kost + + patch by: Murray Cumming + + * gst/gstutils.c: + Mention that this is just like gst_buffer_merge() but with extra + unreffing for C coders. Advise language bindings not to wrap it. + Fixes Bug #533856. + + Also fix file comment. + 2008-08-20 Stefan Kost reviewed by: Wim Taymans diff --git a/gst/gstutils.c b/gst/gstutils.c index 5443b472ab..a48b84942c 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -3,7 +3,7 @@ * 2000 Wim Taymans * 2002 Thomas Vander Stichele * - * gstutils.c: Utility functions: gtk_get_property stuff, etc. + * gstutils.c: Utility functions * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -2420,6 +2420,11 @@ gst_buffer_merge (GstBuffer * buf1, GstBuffer * buf2) * If the buffers point to contiguous areas of memory, the buffer * is created without copying the data. * + * This is a convenience function for C programmers. See also + * gst_buffer_merge(), which does the same thing without + * unreffing the input parameters. Language bindings without + * explicit reference counting should not wrap this function. + * * Returns: the new #GstBuffer which is the concatenation of the source buffers. */ GstBuffer *