diff options
| author | Matthew Waters <matthew@centricular.com> | 2016-10-18 22:29:19 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2016-10-18 22:43:03 +1100 |
| commit | 0abeebc4e86a3b24041eb084381e960099c3a5b4 (patch) | |
| tree | 88f510b1b5d748a4aceec84c1bdb1c8dc26e5b7b | |
| parent | 4b903f0cf3848e1382a757cfd9760914a8bae455 (diff) | |
| download | gstreamer-plugins-bad-0abeebc4e86a3b24041eb084381e960099c3a5b4.tar.gz | |
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
| -rw-r--r-- | gst-libs/gst/gl/egl/gsteglimage.c | 2 | ||||
| -rw-r--r-- | 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 5d2a0a0d8..16441e10f 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 cde47ca19..2af22882b 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); |