From 1af261169c555dbb52ac7f173dc3d75c6a1fce9b Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Wed, 28 Mar 2012 16:39:54 +0200 Subject: [PATCH] buffer: delay buffer unref until buffer no longer needed --- gst/gstbuffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c index 664bdf7..9e05d92 100644 --- a/gst/gstbuffer.c +++ b/gst/gstbuffer.c @@ -1414,8 +1414,6 @@ gst_buffer_append (GstBuffer * buf1, GstBuffer * buf2) GST_BUFFER_MEM_PTR (buf2, i) = NULL; _memory_add (buf1, -1, mem); } - GST_BUFFER_MEM_LEN (buf2) = 0; - gst_buffer_unref (buf2); /* we can calculate the duration too. Also make sure we's not messing * with invalid DURATIONS */ @@ -1428,6 +1426,10 @@ gst_buffer_append (GstBuffer * buf1, GstBuffer * buf2) /* set offset_end */ GST_BUFFER_OFFSET_END (buf1) = GST_BUFFER_OFFSET_END (buf2); } + + GST_BUFFER_MEM_LEN (buf2) = 0; + gst_buffer_unref (buf2); + return buf1; } -- 2.7.4