From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 17 Apr 2012 10:54:45 +0000 (+0200)
Subject: adapter: ensure writable head buffer before skipping part of it
X-Git-Tag: RELEASE-0.11.91~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bcb0ea58eb837bcf3f071fe4d26a40e093f6547;p=platform%2Fupstream%2Fgstreamer.git

adapter: ensure writable head buffer before skipping part of it
---

diff --git a/libs/gst/base/gstadapter.c b/libs/gst/base/gstadapter.c
index ff81080..f8bc613 100644
--- a/libs/gst/base/gstadapter.c
+++ b/libs/gst/base/gstadapter.c
@@ -359,14 +359,17 @@ gst_adapter_try_to_merge_up (GstAdapter * adapter, gsize size)
     return FALSE;
 
   head = g->data;
-  g = g_slist_next (g);
 
   hsize = gst_buffer_get_size (head);
 
   /* Remove skipped part from the buffer (otherwise the buffer might grow indefinitely) */
+  head = gst_buffer_make_writable (head);
   gst_buffer_resize (head, adapter->skip, hsize - adapter->skip);
   hsize -= adapter->skip;
   adapter->skip = 0;
+  g->data = head;
+
+  g = g_slist_next (g);
 
   while (g != NULL && hsize < size) {
     cur = g->data;