From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 6 Apr 2018 15:38:13 +0000 (+0200)
Subject: gstreamer: Cherry-pick some fixes from 0.40
X-Git-Tag: 0.38.9~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8432bdf802f85a92495b67f1245831e219adccdf;p=thirdparty%2Fvala.git

gstreamer: Cherry-pick some fixes from 0.40
---

diff --git a/vapi/gstreamer-audio-1.0.vapi b/vapi/gstreamer-audio-1.0.vapi
index c59912283..53be907d0 100644
--- a/vapi/gstreamer-audio-1.0.vapi
+++ b/vapi/gstreamer-audio-1.0.vapi
@@ -389,7 +389,6 @@ namespace Gst {
 			public size_t size;
 			public Gst.Audio.RingBufferSpec spec;
 			public int state;
-			public Gst.ClockTime timestamps;
 			public int waiting;
 			[CCode (has_construct_function = false)]
 			protected RingBuffer ();
diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi
index 7ec83d627..625b5141d 100644
--- a/vapi/gstreamer-base-1.0.vapi
+++ b/vapi/gstreamer-base-1.0.vapi
@@ -105,8 +105,6 @@ namespace Gst {
 		[CCode (cheader_filename = "gst/base/base.h", cname = "GstAggregatorPad", lower_case_cprefix = "gst_aggregator_pad_", type_id = "gst_aggregator_pad_get_type ()")]
 		[GIR (name = "AggregatorPad")]
 		public class AggregatorPad : Gst.Pad {
-			[CCode (array_length = false)]
-			public weak void* _gst_reserved[4];
 			public weak Gst.Segment segment;
 			[CCode (has_construct_function = false)]
 			protected AggregatorPad ();
diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi
index 867c2a2cc..fc76c8075 100644
--- a/vapi/gstreamer-pbutils-1.0.vapi
+++ b/vapi/gstreamer-pbutils-1.0.vapi
@@ -187,7 +187,7 @@ namespace Gst {
 			[CCode (has_construct_function = false)]
 			protected EncodingProfile ();
 			public Gst.PbUtils.EncodingProfile copy ();
-			public static Gst.PbUtils.EncodingProfile find (string targetname, string profilename, string? category);
+			public static Gst.PbUtils.EncodingProfile find (string targetname, string? profilename, string? category);
 			public static Gst.PbUtils.EncodingProfile from_discoverer (Gst.PbUtils.DiscovererInfo info);
 			public bool get_allow_dynamic_output ();
 			public unowned string get_description ();
diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi
index 6f81a22c6..ebd306181 100644
--- a/vapi/gstreamer-video-1.0.vapi
+++ b/vapi/gstreamer-video-1.0.vapi
@@ -24,13 +24,11 @@ namespace Gst {
 		[GIR (name = "VideoCodecFrame")]
 		public class CodecFrame {
 			public Gst.ClockTime deadline;
-			public uint32 decode_frame_number;
 			public int distance_from_sync;
 			public Gst.ClockTime dts;
 			public Gst.ClockTime duration;
 			public weak Gst.Buffer input_buffer;
 			public weak Gst.Buffer output_buffer;
-			public uint32 presentation_frame_number;
 			public Gst.ClockTime pts;
 			public uint32 system_frame_number;
 			[CCode (simple_generics = true)]
@@ -308,11 +306,6 @@ namespace Gst {
 			public Gst.Video.OverlayComposition make_writable ();
 			public uint n_rectangles ();
 		}
-		[CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
-		[Compact]
-		[GIR (name = "VideoOverlayProperties")]
-		public class OverlayProperties {
-		}
 		[CCode (cheader_filename = "gst/video/video-overlay-composition.h", ref_function = "gst_video_overlay_rectangle_ref", type_id = "gst_video_overlay_rectangle_get_type ()", unref_function = "gst_video_overlay_rectangle_unref")]
 		[Compact]
 		[GIR (name = "VideoOverlayRectangle")]