gl/eglimage: Fix passing the destroy function to gst_egl_image_new_wrapped
authorMatthew Waters <matthew@centricular.com>
Tue, 18 Oct 2016 11:29:19 +0000 (22:29 +1100)
committerMatthew Waters <matthew@centricular.com>
Tue, 18 Oct 2016 11:43:03 +0000 (22:43 +1100)
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
gst-libs/gst/gl/egl/gstglmemoryegl.c

index 5d2a0a0..16441e1 100644 (file)
@@ -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 */
index cde47ca..2af2288 100644 (file)
@@ -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);