From f66727297a26008c1d9d72ecfea87624c25afd24 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 28 Nov 2020 10:51:08 +0100
Subject: [PATCH] Import gir-files from 1.18.1: minor annotation fixes

---
 gir-files/GstApp-1.0.gir     |  4 ++--
 gir-files/GstGL-1.0.gir      | 14 ++++++++------
 gir-files/GstPbutils-1.0.gir |  2 +-
 gir-files/GstVideo-1.0.gir   |  7 +++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gir-files/GstApp-1.0.gir b/gir-files/GstApp-1.0.gir
index 36853f513..15003924a 100644
--- a/gir-files/GstApp-1.0.gir
+++ b/gir-files/GstApp-1.0.gir
@@ -477,7 +477,7 @@ you must check the caps on the samples to get the actual used caps.</doc>
             <doc xml:space="preserve">a #GstAppSink</doc>
             <type name="AppSink" c:type="GstAppSink*"/>
           </instance-parameter>
-          <parameter name="caps" transfer-ownership="none">
+          <parameter name="caps" transfer-ownership="none" nullable="1" allow-none="1">
             <doc xml:space="preserve">caps to set</doc>
             <type name="Gst.Caps" c:type="const GstCaps*"/>
           </parameter>
@@ -1447,7 +1447,7 @@ buffers must match the caps or left NULL.</doc>
             <doc xml:space="preserve">a #GstAppSrc</doc>
             <type name="AppSrc" c:type="GstAppSrc*"/>
           </instance-parameter>
-          <parameter name="caps" transfer-ownership="none">
+          <parameter name="caps" transfer-ownership="none" nullable="1" allow-none="1">
             <doc xml:space="preserve">caps to set</doc>
             <type name="Gst.Caps" c:type="const GstCaps*"/>
           </parameter>
diff --git a/gir-files/GstGL-1.0.gir b/gir-files/GstGL-1.0.gir
index 82a52706f..aaae38e5f 100644
--- a/gir-files/GstGL-1.0.gir
+++ b/gir-files/GstGL-1.0.gir
@@ -3809,7 +3809,7 @@ Data is uploaded or downloaded from the GPU as is necessary.</doc>
         </array>
       </field>
       <method name="copy_into" c:identifier="gst_gl_memory_copy_into" version="1.8">
-        <doc xml:space="preserve">Copies @gl_mem into the texture specfified by @tex_id.  The format of @tex_id
+        <doc xml:space="preserve">Copies @gl_mem into the texture specified by @tex_id.  The format of @tex_id
 is specified by @tex_format, @width and @height.</doc>
         
         <return-value transfer-ownership="none">
@@ -4002,8 +4002,8 @@ already have been modified with gst_video_info_align().</doc>
         </parameters>
       </method>
       <method name="read_pixels" c:identifier="gst_gl_memory_read_pixels" version="1.8">
-        <doc xml:space="preserve">Reads the texture in #GstGLMemory into @read_pointer if no buffer is bound
-to `GL_PIXEL_PACK_BUFFER`.  Otherwise @read_pointer is the byte offset into
+        <doc xml:space="preserve">Reads the texture in #GstGLMemory into @write_pointer if no buffer is bound
+to `GL_PIXEL_PACK_BUFFER`.  Otherwise @write_pointer is the byte offset into
 the currently bound `GL_PIXEL_PACK_BUFFER` buffer to store the result of
 glReadPixels.  See the OpenGL specification for glReadPixels for more
 details.</doc>
@@ -4017,14 +4017,16 @@ details.</doc>
             <doc xml:space="preserve">a #GstGLMemory</doc>
             <type name="GLMemory" c:type="GstGLMemory*"/>
           </instance-parameter>
-          <parameter name="read_pointer" transfer-ownership="none" nullable="1" allow-none="1">
+          <parameter name="write_pointer" transfer-ownership="none" nullable="1" allow-none="1">
             <doc xml:space="preserve">the data pointer to pass to glReadPixels</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
         </parameters>
       </method>
       <method name="texsubimage" c:identifier="gst_gl_memory_texsubimage" version="1.8">
-        <doc xml:space="preserve">See gst_gl_memory_read_pixels() for what @read_pointer signifies.</doc>
+        <doc xml:space="preserve">Reads the texture in @read_pointer into @gl_mem.
+
+See gst_gl_memory_read_pixels() for what @read_pointer signifies.</doc>
         
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -4155,7 +4157,7 @@ Data is uploaded or downloaded from the GPU as is necessary.</doc>
         </array>
       </field>
       <method name="copy_into_texture" c:identifier="gst_gl_memory_pbo_copy_into_texture" version="1.8">
-        <doc xml:space="preserve">Copies @gl_mem into the texture specfified by @tex_id.  The format of @tex_id
+        <doc xml:space="preserve">Copies @gl_mem into the texture specified by @tex_id.  The format of @tex_id
 is specified by @tex_format, @width and @height.
 
 If @respecify is %TRUE, then the copy is performed in terms of the texture
diff --git a/gir-files/GstPbutils-1.0.gir b/gir-files/GstPbutils-1.0.gir
index 0e1b82284..ed0677144 100644
--- a/gir-files/GstPbutils-1.0.gir
+++ b/gir-files/GstPbutils-1.0.gir
@@ -2761,7 +2761,7 @@ in debugging.</doc>
       
       <type name="gint" c:type="gint"/>
     </constant>
-    <constant name="PLUGINS_BASE_VERSION_MICRO" value="0" c:type="GST_PLUGINS_BASE_VERSION_MICRO">
+    <constant name="PLUGINS_BASE_VERSION_MICRO" value="1" c:type="GST_PLUGINS_BASE_VERSION_MICRO">
       <doc xml:space="preserve">The micro version of GStreamer's gst-plugins-base libraries at compile time.</doc>
       
       <type name="gint" c:type="gint"/>
diff --git a/gir-files/GstVideo-1.0.gir b/gir-files/GstVideo-1.0.gir
index d84804b43..db1a8a91d 100644
--- a/gir-files/GstVideo-1.0.gir
+++ b/gir-files/GstVideo-1.0.gir
@@ -6384,7 +6384,6 @@ the interlacing mode.</doc>
             <type name="VideoFormat" c:type="GstVideoFormat"/>
           </parameter>
           <parameter name="mode" transfer-ownership="none">
-            <doc xml:space="preserve">A #GstVideoInterlaceMode</doc>
             <type name="VideoInterlaceMode" c:type="GstVideoInterlaceMode"/>
           </parameter>
           <parameter name="width" transfer-ownership="none">
@@ -9867,7 +9866,7 @@ mode of the stream.</doc>
         <doc xml:space="preserve">1 field is stored in one buffer,
     @GST_VIDEO_BUFFER_FLAG_TF or @GST_VIDEO_BUFFER_FLAG_BF indicates if
     the buffer is carrying the top or bottom field, respectively. The top and
-    bottom buffers are expected to alternate in the pipeline, with this mode
+    bottom buffers must alternate in the pipeline, with this mode
     (Since: 1.16).</doc>
       </member>
       <function name="from_string" c:identifier="gst_video_interlace_mode_from_string" version="1.6">
@@ -15416,7 +15415,7 @@ Depending on @func, different formulas might be applied. Some formulas
 encode a linear segment in the lower range.</doc>
       
       <return-value transfer-ownership="none">
-        <doc xml:space="preserve">the gamme decoded value of @val</doc>
+        <doc xml:space="preserve">the gamma decoded value of @val</doc>
         <type name="gdouble" c:type="gdouble"/>
       </return-value>
       <parameters>
@@ -15444,7 +15443,7 @@ Depending on @func, different formulas might be applied. Some formulas
 encode a linear segment in the lower range.</doc>
       
       <return-value transfer-ownership="none">
-        <doc xml:space="preserve">the gamme encoded value of @val</doc>
+        <doc xml:space="preserve">the gamma encoded value of @val</doc>
         <type name="gdouble" c:type="gdouble"/>
       </return-value>
       <parameters>