summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-03-14 21:35:45 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-03-14 21:35:45 +0100
commit28034226c6b43d572397f34f00e03e99c677a231 (patch)
tree349426da5cd0d6decf159430925757d7a59c53f6
parent39d78762b9a59e035bf6777d4fb7ec62f9154d2b (diff)
update for memory api changes
-rw-r--r--gst-libs/gst/rtp/gstrtpbuffer.c2
-rw-r--r--gst-libs/gst/video/gstvideopool.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/gst-libs/gst/rtp/gstrtpbuffer.c b/gst-libs/gst/rtp/gstrtpbuffer.c
index 709832ea6..16d0515da 100644
--- a/gst-libs/gst/rtp/gstrtpbuffer.c
+++ b/gst-libs/gst/rtp/gstrtpbuffer.c
@@ -109,7 +109,7 @@ gst_rtp_buffer_allocate_data (GstBuffer * buffer, guint payload_len,
len = GST_RTP_HEADER_LEN + csrc_count * sizeof (guint32)
+ payload_len + pad_len;
- mem = gst_allocator_alloc (NULL, len, 0);
+ mem = gst_allocator_alloc (NULL, 0, len, 0, len, 0);
gst_memory_map (mem, &map, GST_MAP_WRITE);
/* fill in defaults */
diff --git a/gst-libs/gst/video/gstvideopool.c b/gst-libs/gst/video/gstvideopool.c
index d26d72d70..e9fbb5a10 100644
--- a/gst-libs/gst/video/gstvideopool.c
+++ b/gst-libs/gst/video/gstvideopool.c
@@ -251,13 +251,12 @@ video_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
GST_DEBUG_OBJECT (pool, "alloc %" G_GSIZE_FORMAT, info->size);
maxsize = info->size + priv->prefix + priv->padding;
- mem = gst_allocator_alloc (priv->allocator, maxsize, priv->align);
+ mem = gst_allocator_alloc (priv->allocator, 0, maxsize, priv->prefix,
+ info->size, priv->align);
if (mem == NULL)
goto no_memory;
*buffer = gst_buffer_new ();
- if (priv->prefix != 0 || priv->padding != 0)
- gst_memory_resize (mem, priv->prefix, info->size);
gst_buffer_take_memory (*buffer, -1, mem);
if (priv->add_videometa) {