diff options
| author | Matthew Waters <matthew@centricular.com> | 2015-12-17 15:23:13 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2015-12-17 15:44:22 +1100 |
| commit | 5dcd5002575ccae25a5ee0cc44b761f8fc74542e (patch) | |
| tree | 73f8c1fb040c221a7d01b831bf1baa3239c5abf6 /sys | |
| parent | 491e2eefcb3e9af1e1c3a0f7bdc48c80802877ef (diff) | |
| download | gstreamer-plugins-bad-5dcd5002575ccae25a5ee0cc44b761f8fc74542e.tar.gz | |
gl*memory*: reverse the parameter order of user_data and destroy notify
The convention is to have the destroy notify last after any user data
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/applemedia/iosurfacememory.c | 2 | ||||
| -rw-r--r-- | sys/applemedia/videotexturecache.m | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/applemedia/iosurfacememory.c b/sys/applemedia/iosurfacememory.c index 2736a27c0..04acc518f 100644 --- a/sys/applemedia/iosurfacememory.c +++ b/sys/applemedia/iosurfacememory.c @@ -170,7 +170,7 @@ _io_surface_memory_new (GstGLContext * context, mem = g_slice_new0 (GstIOSurfaceMemory); gst_gl_memory_init (&mem->gl_mem, _io_surface_memory_allocator, NULL, context, - target, NULL, info, plane, valign, notify, user_data); + target, NULL, info, plane, valign, user_data, notify); GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_READONLY); GST_MINI_OBJECT_FLAG_SET (mem, GST_MEMORY_FLAG_NO_SHARE); diff --git a/sys/applemedia/videotexturecache.m b/sys/applemedia/videotexturecache.m index 18808c092..223b40e1f 100644 --- a/sys/applemedia/videotexturecache.m +++ b/sys/applemedia/videotexturecache.m @@ -175,8 +175,8 @@ gl_mem_from_buffer (GstVideoTextureCache * cache, gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture)); params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx, NULL, &cache->input_info, 0, NULL, gl_target, - CVOpenGLESTextureGetName (texture), (GDestroyNotify) CFRelease, - texture); + CVOpenGLESTextureGetName (texture), texture, + (GDestroyNotify) CFRelease); *mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc, (GstGLAllocationParams *) params); @@ -201,8 +201,8 @@ gl_mem_from_buffer (GstVideoTextureCache * cache, gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture)); params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx, NULL, &cache->input_info, 0, NULL, gl_target, - CVOpenGLESTextureGetName (texture), (GDestroyNotify) CFRelease, - texture); + CVOpenGLESTextureGetName (texture), texture, + (GDestroyNotify) CFRelease); *mem1 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc, (GstGLAllocationParams *) params); @@ -222,8 +222,8 @@ gl_mem_from_buffer (GstVideoTextureCache * cache, gl_target = gst_gl_texture_target_from_gl (CVOpenGLESTextureGetTarget (texture)); params = gst_gl_video_allocation_params_new_wrapped_texture (cache->ctx, NULL, &cache->input_info, 1, NULL, gl_target, - CVOpenGLESTextureGetName (texture), (GDestroyNotify) CFRelease, - texture); + CVOpenGLESTextureGetName (texture), texture, + (GDestroyNotify) CFRelease); *mem2 = (GstMemory *) gst_gl_base_memory_alloc (base_mem_alloc, (GstGLAllocationParams *) params); |