summaryrefslogtreecommitdiff
path: root/tests/examples
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-07-27 12:12:37 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2012-07-27 12:17:29 +0200
commita2027b5e9b2a7f2df00ce37ec72d0eab2695a0fc (patch)
tree20f784c1aab62a14f1870977cbaa2dba5e85af8d /tests/examples
parent60382cd994e34ac5ef030f2f133a594fc82cbe9e (diff)
allocator: remove user_data from alloc vmethod
Remove the user_data from the alloc vmethod. Subclasses that implement a new alloc function can also implement their own vmethod to pass extra arguments. We can then also require that custom allocators implement an alloc function so that gst_allocator_alloc() always works.
Diffstat (limited to 'tests/examples')
-rw-r--r--tests/examples/memory/my-memory.c3
-rw-r--r--tests/examples/memory/my-vidmem.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/examples/memory/my-memory.c b/tests/examples/memory/my-memory.c
index 1e5ca6d32..1bbd9609c 100644
--- a/tests/examples/memory/my-memory.c
+++ b/tests/examples/memory/my-memory.c
@@ -29,8 +29,7 @@ typedef struct
static GstMemory *
-_my_alloc (GstAllocator * allocator, gsize size,
- GstAllocationParams * params, gpointer user_data)
+_my_alloc (GstAllocator * allocator, gsize size, GstAllocationParams * params)
{
MyMemory *mem;
gsize maxsize = size + params->prefix + params->padding;
diff --git a/tests/examples/memory/my-vidmem.c b/tests/examples/memory/my-vidmem.c
index 126863966..b1a58be13 100644
--- a/tests/examples/memory/my-vidmem.c
+++ b/tests/examples/memory/my-vidmem.c
@@ -34,8 +34,7 @@ typedef struct
static GstMemory *
-_my_alloc (GstAllocator * allocator, gsize size,
- GstAllocationParams * params, gpointer user_data)
+_my_alloc (GstAllocator * allocator, gsize size, GstAllocationParams * params)
{
g_warning ("Use my_vidmem_alloc() to allocate from this allocator");