waylandsink: Fix memory leak of shm allocator

This fixes conflict resolution error introduced in commit:

  816d115317

http://bugzilla.gnome.org/show_bug.cgi?id=790042
This commit is contained in:
Nicolas Dufresne 2017-12-06 20:50:31 -05:00
parent 816d115317
commit c04aba241e

View file

@ -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);