From 95833db9056f55d80af85b7956ba82e7a749060a Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Sat, 23 Nov 2013 22:57:03 +1100 Subject: [PATCH] [866/906] upload: update some docs --- gst-libs/gst/gl/gstglupload.c | 6 +++--- gst-libs/gst/gl/gstglupload.h | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c index cb64aa4..3dac6fe 100644 --- a/gst-libs/gst/gl/gstglupload.c +++ b/gst-libs/gst/gl/gstglupload.c @@ -529,8 +529,8 @@ gst_gl_upload_init_format (GstGLUpload * upload, GstVideoFormat v_format, * @buffer: a #GstBuffer * @tex_id: resulting texture * - * Uploads @buffer to the texture given by @texture_id. @texture_id is valid - * until gst_gl_upload_release() is called. + * Uploads @buffer to the texture given by @tex_id. @tex_id is valid + * until gst_gl_upload_release_buffer() is called. * * Returns: whether the upload was successful */ @@ -873,7 +873,7 @@ gst_gl_upload_add_video_gl_texture_upload_meta (GstGLUpload * upload, * @texture_id: the texture id to download * @data: where the downloaded data should go * - * Uploads @data into @texture_id. @data size and format is specified by + * Uploads @data into @texture_id. data size and format is specified by * the #GstVideoFormat passed to gst_gl_upload_init_format() * * Returns: whether the upload was successful diff --git a/gst-libs/gst/gl/gstglupload.h b/gst-libs/gst/gl/gstglupload.h index 6ab8444..a56759f 100644 --- a/gst-libs/gst/gl/gstglupload.h +++ b/gst-libs/gst/gl/gstglupload.h @@ -38,15 +38,12 @@ GType gst_gl_upload_get_type (void); /** * GstGLUpload - * @parent: the parent object - * @lock: thread safety - * @display: a #GstGLDisplay - * @info: the output video info * - * Upload information for GL textures + * Opaque #GstGLUpload object */ struct _GstGLUpload { + /* */ GObject parent; GMutex lock; @@ -56,7 +53,6 @@ struct _GstGLUpload /* input data */ GstVideoInfo info; - /* */ gpointer data[GST_VIDEO_MAX_PLANES]; gboolean initted; -- 2.7.4