From f8781e3de80c7602f854e98d16ba72e7427e8887 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Sat, 6 Mar 2004 20:56:28 +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... --- gst/mpeg2sub/gstmpeg2subt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gst/mpeg2sub') diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c index 1774b13e..d267932a 100644 --- a/gst/mpeg2sub/gstmpeg2subt.c +++ b/gst/mpeg2sub/gstmpeg2subt.c @@ -369,10 +369,11 @@ gst_mpeg2subt_chain_subtitle (GstPad *pad, GstData *_data) /* deal with partial frame from previous buffer */ if (mpeg2subt->partialbuf) { - - mpeg2subt->partialbuf = gst_buffer_merge(mpeg2subt->partialbuf, buf); - /* and the one we received.. */ + GstBuffer *merge; + merge = gst_buffer_merge(mpeg2subt->partialbuf, buf); + gst_buffer_unref (mpeg2subt->partialbuf); gst_buffer_unref(buf); + mpeg2subt->partialbuf = merge; } else { mpeg2subt->partialbuf = buf; -- cgit v1.2.1