mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/eglimage: Fix passing the destroy function to gst_egl_image_new_wrapped

Browse source 
The function pointer and the user data arguments were swapped in both
uses.

https://bugzilla.gnome.org/show_bug.cgi?id=769382
This commit is contained in:
Matthew Waters 2016-10-18 22:29:19 +11:00 committed by Tim-Philipp Müller
parent e49f723a07
commit 36b8ed8712
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/gl/egl/gsteglimage.c
View file

@ -317,6 +317,6 @@ gst_egl_image_from_dmabuf (GstGLContext * context,
return gst_egl_image_new_wrapped (context, img, type, return gst_egl_image_new_wrapped (context, img, type,
GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_NORMAL, GST_VIDEO_GL_TEXTURE_ORIENTATION_X_NORMAL_Y_NORMAL,
(GstEGLImageDestroyNotify) _destroy_egl_image, NULL); NULL, (GstEGLImageDestroyNotify) _destroy_egl_image);
} }
#endif /* GST_GL_HAVE_DMABUF */ #endif /* GST_GL_HAVE_DMABUF */

2
gst-libs/gst/gl/egl/gstglmemoryegl.c
View 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, gl_mem->image = gst_egl_image_new_wrapped (context, image, 0, 0,
(GstEGLImageDestroyNotify) _destroy_egl_image, NULL); NULL, (GstEGLImageDestroyNotify) _destroy_egl_image);
} else { } else {
gl->ActiveTexture (GL_TEXTURE0 + gl_mem->mem.plane); gl->ActiveTexture (GL_TEXTURE0 + gl_mem->mem.plane);
gl->BindTexture (GL_TEXTURE_2D, gl_mem->mem.tex_id); gl->BindTexture (GL_TEXTURE_2D, gl_mem->mem.tex_id);