From c04aba241e2595bcafcd587b70bcb3724bbd3c35 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Wed, 6 Dec 2017 20:50:31 -0500 Subject: [PATCH] waylandsink: Fix memory leak of shm allocator This fixes conflict resolution error introduced in commit: 816d115317c522c87297109de781c63b16146493 http://bugzilla.gnome.org/show_bug.cgi?id=790042 --- ext/wayland/gstwaylandsink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c index 8d8cedbc06..ff08194529 100644 --- a/ext/wayland/gstwaylandsink.c +++ b/ext/wayland/gstwaylandsink.c @@ -583,7 +583,7 @@ gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query) g_object_unref (pool); alloc = gst_wl_shm_allocator_get (); - gst_query_add_allocation_param (query, gst_wl_shm_allocator_get (), NULL); + gst_query_add_allocation_param (query, alloc, NULL); gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL); g_object_unref (alloc);