From b271ebd760f2309acc2f1fee7bc176abdd576c27 Mon Sep 17 00:00:00 2001 From: gb Date: Tue, 23 Mar 2010 13:32:36 +0000 Subject: [PATCH] Drop introspection annotations since they require gtk-doc >= 1.12. --- configure.ac | 1 + docs/reference/libs/libs-docs.xml.in | 1 + gst-libs/gst/vaapi/gstvaapidisplay.c | 8 ++++---- gst-libs/gst/vaapi/gstvaapiimage.c | 6 +++--- gst-libs/gst/vaapi/gstvaapisurface.c | 8 ++++---- gst-libs/gst/vaapi/gstvaapiwindow.c | 8 ++++---- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 786ef7b3b5..df3296bb44 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ m4_define([libva_sds_version], [libva_glx_sds_version_0_31]) m4_define([libva_sds_package_version], [libva_glx_sds_package_version_0_31]) # gtk-doc version number +# XXX: introspection annotations require gtk-doc >= 1.12 m4_define([gtkdoc_major_version], [1]) m4_define([gtkdoc_minor_version], [9]) m4_define([gtkdoc_version], [gtkdoc_major_version.gtkdoc_minor_version]) diff --git a/docs/reference/libs/libs-docs.xml.in b/docs/reference/libs/libs-docs.xml.in index 48fccf22c7..c136180a7a 100644 --- a/docs/reference/libs/libs-docs.xml.in +++ b/docs/reference/libs/libs-docs.xml.in @@ -25,5 +25,6 @@ + diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c index e084baf164..eb06ac068c 100644 --- a/gst-libs/gst/vaapi/gstvaapidisplay.c +++ b/gst-libs/gst/vaapi/gstvaapidisplay.c @@ -618,8 +618,8 @@ gst_vaapi_display_get_height(GstVaapiDisplay *display) /** * gst_vaapi_display_get_size: * @display: a #GstVaapiDisplay - * @pwidth: (out) (allow-none): return location for the width, or %NULL - * @pheight: (out) (allow-none): return location for the height, or %NULL + * @pwidth: return location for the width, or %NULL + * @pheight: return location for the height, or %NULL * * Retrieves the dimensions of a #GstVaapiDisplay. */ @@ -638,8 +638,8 @@ gst_vaapi_display_get_size(GstVaapiDisplay *display, guint *pwidth, guint *pheig /** * gst_vaapi_display_get_pixel_aspect_ratio: * @display: a #GstVaapiDisplay - * @par_n: (out) (allow-none): return location for the numerator of pixel aspect ratio, or %NULL - * @par_d: (out) (allow-none): return location for the denominator of pixel aspect ratio, or %NULL + * @par_n: return location for the numerator of pixel aspect ratio, or %NULL + * @par_d: return location for the denominator of pixel aspect ratio, or %NULL * * Retrieves the pixel aspect ratio of a #GstVaapiDisplay. */ diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c index c1d7b40ac3..5da91fda84 100644 --- a/gst-libs/gst/vaapi/gstvaapiimage.c +++ b/gst-libs/gst/vaapi/gstvaapiimage.c @@ -563,7 +563,7 @@ gst_vaapi_image_get_id(GstVaapiImage *image) /** * gst_vaapi_image_get_image: * @image: a #GstVaapiImage - * @va_image: (output): a VA image + * @va_image: a VA image * * Fills @va_image with the VA image used internally. * @@ -721,8 +721,8 @@ gst_vaapi_image_get_height(GstVaapiImage *image) /** * gst_vaapi_image_get_size: * @image: a #GstVaapiImage - * @pwidth: (out) (allow-none): return location for the width, or %NULL - * @pheight: (out) (allow-none): return location for the height, or %NULL + * @pwidth: return location for the width, or %NULL + * @pheight: return location for the height, or %NULL * * Retrieves the dimensions of a #GstVaapiImage. */ diff --git a/gst-libs/gst/vaapi/gstvaapisurface.c b/gst-libs/gst/vaapi/gstvaapisurface.c index d9c3cbeb9c..dd5fca0b2c 100644 --- a/gst-libs/gst/vaapi/gstvaapisurface.c +++ b/gst-libs/gst/vaapi/gstvaapisurface.c @@ -414,8 +414,8 @@ gst_vaapi_surface_get_height(GstVaapiSurface *surface) /** * gst_vaapi_surface_get_size: * @surface: a #GstVaapiSurface - * @pwidth: (out) (allow-none): return location for the width, or %NULL - * @pheight: (out) (allow-none): return location for the height, or %NULL + * @pwidth: return location for the width, or %NULL + * @pheight: return location for the height, or %NULL * * Retrieves the dimensions of a #GstVaapiSurface. */ @@ -574,9 +574,9 @@ gst_vaapi_surface_put_image(GstVaapiSurface *surface, GstVaapiImage *image) * gst_vaapi_surface_associate_subpicture: * @surface: a #GstVaapiSurface * @subpicture: a #GstVaapiSubpicture - * @src_rect: (allow-none): the sub-rectangle of the source subpicture + * @src_rect: the sub-rectangle of the source subpicture * image to extract and process. If %NULL, the entire image will be used. - * @dst_rect: (allow-none): the sub-rectangle of the destination + * @dst_rect: the sub-rectangle of the destination * surface into which the image is rendered. If %NULL, the entire * surface will be used. * diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.c b/gst-libs/gst/vaapi/gstvaapiwindow.c index 864588a203..86aeb95c46 100644 --- a/gst-libs/gst/vaapi/gstvaapiwindow.c +++ b/gst-libs/gst/vaapi/gstvaapiwindow.c @@ -383,8 +383,8 @@ gst_vaapi_window_get_height(GstVaapiWindow *window) /** * gst_vaapi_window_get_size: * @window: a #GstVaapiWindow - * @pwidth: (out) (allow-none): return location for the width, or %NULL - * @pheight: (out) (allow-none): return location for the height, or %NULL + * @pwidth: return location for the width, or %NULL + * @pheight: return location for the height, or %NULL * * Retrieves the dimensions of a #GstVaapiWindow. */ @@ -484,9 +484,9 @@ get_window_rect(GstVaapiWindow *window, GstVaapiRectangle *rect) * gst_vaapi_window_put_surface: * @window: a #GstVaapiWindow * @surface: a #GstVaapiSurface - * @src_rect: (allow-none): the sub-rectangle of the source surface to + * @src_rect: the sub-rectangle of the source surface to * extract and process. If %NULL, the entire surface will be used. - * @dst_rect: (allow-none): the sub-rectangle of the destination + * @dst_rect: the sub-rectangle of the destination * window into which the surface is rendered. If %NULL, the entire * window will be used. * @flags: postprocessing flags. See #GstVaapiSurfaceRenderFlags