From 36b8ed871241e020187eb3b026bf5b5bd0eb0af8 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 18 Oct 2016 22:29:19 +1100 Subject: [PATCH] gl/eglimage: Fix passing the destroy function to gst_egl_image_new_wrapped The function pointer and the user data arguments were swapped in both uses. https://bugzilla.gnome.org/show_bug.cgi?id=769382 --- gst-libs/gst/gl/egl/gsteglimage.c | 2 +- gst-libs/gst/gl/egl/gstglmemoryegl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/gl/egl/gsteglimage.c b/gst-libs/gst/gl/egl/gsteglimage.c index 5d2a0a0..16441e1 100644 --- a/gst-libs/gst/gl/egl/gsteglimage.c +++ b/gst-libs/gst/gl/egl/gsteglimage.c @@ -317,6 +317,6 @@ gst_egl_image_from_dmabuf (GstGLContext * context, return gst_egl_image_new_wrapped (context, img, type, GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_NORMAL, - (GstEGLImageDestroyNotify) _destroy_egl_image, NULL); + NULL, (GstEGLImageDestroyNotify) _destroy_egl_image); } #endif /* GST_GL_HAVE_DMABUF */ diff --git a/gst-libs/gst/gl/egl/gstglmemoryegl.c b/gst-libs/gst/gl/egl/gstglmemoryegl.c index cde47ca..2af2288 100644 --- a/gst-libs/gst/gl/egl/gstglmemoryegl.c +++ b/gst-libs/gst/gl/egl/gstglmemoryegl.c @@ -173,7 +173,7 @@ _gl_mem_create (GstGLMemoryEGL * gl_mem, GError ** error) } gl_mem->image = gst_egl_image_new_wrapped (context, image, 0, 0, - (GstEGLImageDestroyNotify) _destroy_egl_image, NULL); + NULL, (GstEGLImageDestroyNotify) _destroy_egl_image); } else { gl->ActiveTexture (GL_TEXTURE0 + gl_mem->mem.plane); gl->BindTexture (GL_TEXTURE_2D, gl_mem->mem.tex_id); -- 2.7.4