adapter: refresh skip following merge_up attempt
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 23 Apr 2012 14:57:16 +0000 (16:57 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Mon, 23 Apr 2012 14:57:21 +0000 (16:57 +0200)
... as the latter might now adjust skip as well.

libs/gst/base/gstadapter.c

index f8bc613..4183b81 100644 (file)
@@ -763,6 +763,7 @@ gst_adapter_take_buffer (GstAdapter * adapter, gsize nbytes)
   if (gst_adapter_try_to_merge_up (adapter, nbytes)) {
     /* Merged something, let's try again for sub-buffering */
     cur = adapter->buflist->data;
+    skip = adapter->skip;
     if (gst_buffer_get_size (cur) >= nbytes + skip) {
       GST_LOG_OBJECT (adapter, "providing buffer of %" G_GSIZE_FORMAT " bytes"
           " via sub-buffer", nbytes);