From 89bbfdc3683c00f14cf7142cd19faadaf2ccc1c8 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Sat, 6 Mar 2004 20:56:27 +0000 Subject: Fix several misuse of gst_buffer_merge (it doesn't take ownership of any buffer), should fix some leaks. I hope I did... Original commit message from CVS: 2004-03-06 Christophe Fergeau * ext/faac/gstfaac.c: (gst_faac_chain): * ext/flac/gstflactag.c: (gst_flac_tag_chain): * ext/libpng/gstpngenc.c: (user_write_data): * ext/mikmod/gstmikmod.c: (gst_mikmod_loop): * gst/ac3parse/gstac3parse.c: (gst_ac3parse_chain): * gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_chain_subtitle): * gst/mpegstream/gstrfc2250enc.c: (gst_rfc2250_enc_add_slice): Fix several misuse of gst_buffer_merge (it doesn't take ownership of any buffer), should fix some leaks. I hope I didn't unref buffers that shouldn't be... --- ext/libpng/gstpngenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/libpng') diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index 8af25d38..393e642c 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -207,8 +207,11 @@ void user_write_data (png_structp png_ptr, png_bytep data, png_uint_32 length) if (pngenc->buffer_out) { - pngenc->buffer_out = gst_buffer_merge (pngenc->buffer_out, buffer); + GstBuffer *merge; + merge = gst_buffer_merge (pngenc->buffer_out, buffer); gst_buffer_unref (buffer); + gst_buffer_unref (pngenc->buffer_out); + pngenc->buffer_out = merge; } else pngenc->buffer_out = buffer; -- cgit