From 3cefdd6673602db191b82fed3f18fc05f37104f1 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 6 Jan 2016 15:50:07 +1100 Subject: [PATCH] glbasememory: fix copying GstGLAllocationParams Fixes a GST_IS_GL_CONTEXT critical --- gst-libs/gst/gl/gstglbasememory.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstglbasememory.c b/gst-libs/gst/gl/gstglbasememory.c index 1988b327af..dbc756ebc7 100644 --- a/gst-libs/gst/gl/gstglbasememory.c +++ b/gst-libs/gst/gl/gstglbasememory.c @@ -654,11 +654,9 @@ gst_gl_allocation_params_copy_data (GstGLAllocationParams * src, GstGLAllocationParams * dest) { gst_gl_allocation_params_init (dest, src->struct_size, src->alloc_flags, - src->copy, src->free, NULL, src->alloc_size, NULL, src->wrapped_data, - src->gl_handle, src->user_data, src->notify); + src->copy, src->free, src->context, src->alloc_size, NULL, + src->wrapped_data, src->gl_handle, src->user_data, src->notify); - if (src->context) - dest->context = gst_object_ref (src->context); if (src->alloc_params) dest->alloc_params = gst_allocation_params_copy (src->alloc_params); }