diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2015-03-20 20:12:38 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2015-03-20 20:12:38 +0100 |
| commit | 5863943e78cd2d39f1ba1e3876c9b9d71a8e8718 (patch) | |
| tree | b49c8baf5a1fe5a468605e6ec100c9a7220be963 /vapi/metadata | |
| parent | 144e504a0b2fdf9e402a4c44aa65a04b517b9756 (diff) | |
| download | vala-5863943e78cd2d39f1ba1e3876c9b9d71a8e8718.tar.gz | |
gstreamer-1.0: Backport some fixes from gstreamer 1.5/1.6 git
Diffstat (limited to 'vapi/metadata')
| -rw-r--r-- | vapi/metadata/Gst-1.0.metadata | 5 | ||||
| -rw-r--r-- | vapi/metadata/GstPbutils-1.0.metadata | 4 | ||||
| -rw-r--r-- | vapi/metadata/GstVideo-1.0.metadata | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/vapi/metadata/Gst-1.0.metadata b/vapi/metadata/Gst-1.0.metadata index edac5467b..2b59f052e 100644 --- a/vapi/metadata/Gst-1.0.metadata +++ b/vapi/metadata/Gst-1.0.metadata @@ -220,5 +220,10 @@ Structure.new_from_string skip // Upstream /////////// +// Upstream backports from 1.5/1.6 +PadChainFunction.buffer owned +PadChainListFunction.list owned +PadEventFunction.event owned + // Bug #730957: ElementFactory.get_metadata_keys nullable diff --git a/vapi/metadata/GstPbutils-1.0.metadata b/vapi/metadata/GstPbutils-1.0.metadata index 3042a1255..453b986c5 100644 --- a/vapi/metadata/GstPbutils-1.0.metadata +++ b/vapi/metadata/GstPbutils-1.0.metadata @@ -6,3 +6,7 @@ pb_utils_* name="pb_utils_(.+)" codec_utils_aac_* parent="Gst.PbUtils.Codec.AAC" name="codec_utils_aac_(.+)" codec_utils_h264_* parent="Gst.PbUtils.Codec.H264" name="codec_utils_h264_(.+)" codec_utils_mpeg4video_* parent="Gst.PbUtils.Codec.MPEG4Video" name="codec_utils_mpeg4video_(.+)" + +// Upstream backports from 1.5/1.6 +DiscovererInfo + .get_missing_elements_installer_details unowned diff --git a/vapi/metadata/GstVideo-1.0.metadata b/vapi/metadata/GstVideo-1.0.metadata index ce0d95696..62b130f18 100644 --- a/vapi/metadata/GstVideo-1.0.metadata +++ b/vapi/metadata/GstVideo-1.0.metadata @@ -26,4 +26,8 @@ VideoInfo .finfo nullable VideoChromaResample skip -video_chroma_resample skip
\ No newline at end of file +video_chroma_resample skip + +// Upstream backports from 1.5/1.6 +video_blend_scale_linear_RGBA.dest out +video_blend_scale_linear_RGBA.dest_buffer out unowned=false |