diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2013-11-23 22:56:10 +1100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-12-30 11:13:52 +0100 |
| commit | 85a9fcf544895d7c89a066c92b4fb6ae9c350018 (patch) | |
| tree | b1b6dfbd3a7d1db07ac01da5ba9aa112be3f3d12 /gst-libs | |
| parent | 6a8412e28576cff026c07580c6a797544897d16b (diff) | |
glmem: update the docs
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/gstglmemory.c | 10 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglmemory.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c index 976b81b..fc335a7 100644 --- a/gst-libs/gst/gl/gstglmemory.c +++ b/gst-libs/gst/gl/gstglmemory.c @@ -391,6 +391,16 @@ _gl_mem_free (GstAllocator * allocator, GstMemory * mem) g_slice_free (GstGLMemory, gl_mem); } +/** + * gst_gl_memory_copy_into_texture: + * @gl_mem:a #GstGLMemory + * @tex_id:OpenGL texture id + * + * Copies @gl_mem into the texture specfified by @tex_id. This assumes that + * @tex_id has the same dimensions as @gl_mem. + * + * Returns: Whether the copy suceeded + */ gboolean gst_gl_memory_copy_into_texture (GstGLMemory * gl_mem, guint tex_id) { diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h index 96768b4..013a3da 100644 --- a/gst-libs/gst/gl/gstglmemory.h +++ b/gst-libs/gst/gl/gstglmemory.h @@ -67,7 +67,7 @@ typedef enum /** * GstGLMemory: * @mem: the parent object - * @display: the #GstGLDisplay to use for GL operations + * @context: the #GstGLContext to use for GL operations * @tex_id: the texture id for this memory * @v_format: the video format of this texture * @gl_format: the format of the texture @@ -121,7 +121,7 @@ struct _GstGLMemory * @mem: a #GstGLMemory * @flag: a flag * - * Returns: Whether @flag is set on @mem + * Whether @flag is set on @mem */ #define GST_GL_MEMORY_FLAG_IS_SET(mem,flag) GST_MEMORY_FLAG_IS_SET(mem,flag) |