From 0474720c8bd44087d4cb08a25a275496987593b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 27 Jan 2023 16:22:06 +0200 Subject: [PATCH] gldisplay: Mark `gst_gl_display_create_context()` `other_context` parameter as nullable See https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/issues/438 Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcontext.c | 4 ++-- subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcontext.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcontext.c index 4eac6b2..c04f955 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcontext.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcontext.c @@ -1019,8 +1019,8 @@ gst_gl_context_can_share (GstGLContext * context, GstGLContext * other_context) /** * gst_gl_context_create: * @context: a #GstGLContext: - * @other_context: (allow-none): a #GstGLContext to share OpenGL objects with - * @error: (allow-none): a #GError + * @other_context: (nullable): a #GstGLContext to share OpenGL objects with + * @error: a #GError * * Creates an OpenGL context with the specified @other_context as a context * to share shareable OpenGL objects with. See the OpenGL specification for diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c index 2130eb7..bcc600e 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstgldisplay.c @@ -620,7 +620,7 @@ gst_context_get_gl_display (GstContext * context, GstGLDisplay ** display) /** * gst_gl_display_create_context: * @display: a #GstGLDisplay - * @other_context: (transfer none): other #GstGLContext to share resources with. + * @other_context: (transfer none) (nullable): other #GstGLContext to share resources with. * @p_context: (transfer full) (out): resulting #GstGLContext * @error: resulting #GError * -- 2.7.4