From aa573cf138117b1f497f875ec289edccf60cd2a5 Mon Sep 17 00:00:00 2001
From: Matthew Waters <ystreet00@gmail.com>
Date: Sat, 23 Nov 2013 22:56:10 +1100
Subject: [PATCH] [858/906] glmem: update the docs

---
 gst-libs/gst/gl/gstglmemory.c | 10 ++++++++++
 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 976b81b2b8..fc335a764c 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 96768b46a3..013a3da926 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)