mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-02-17 03:25:36 +00:00
Code Issues Projects Releases Wiki Activity

gtsreamer-base: Fix version for gst_flow_combiner_ref/unref

Browse source 
gst_flow_combiner_ref/unref were introduced in gstreamer-1.12.1 but they
inherit the `since version` declared for `GstFlowCombiner` which is 1.4.

Fixes https://github.com/sdroege/gstreamer-sys/pull/5
This commit is contained in:
fengalin 2017-10-10 16:37:56 +02:00 committed by Sebastian Dröge
parent 1349ab5b30
commit 4b228f5f7f
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gir-files/GstBase-1.0.gir
View file

@ -10221,7 +10221,8 @@ returned immediatelly from the gst_flow_combiner_update_flow() function.</doc>
</instance-parameter>
</parameters>
</method>
<method name="ref" c:identifier="gst_flow_combiner_ref">
<method name="ref" c:identifier="gst_flow_combiner_ref"
version="1.12.1">
<return-value transfer-ownership="full">
<type name="FlowCombiner" c:type="GstFlowCombiner*"/>
</return-value>
@ -10263,7 +10264,8 @@ returned immediatelly from the gst_flow_combiner_update_flow() function.</doc>
</instance-parameter>
</parameters>
</method>
<method name="unref" c:identifier="gst_flow_combiner_unref">
<method name="unref" c:identifier="gst_flow_combiner_unref"
version="1.12.1">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>

1
gstreamer-base-sys/Cargo.toml
View file

@ -18,6 +18,7 @@ v1_6 = ["v1_4"]
v1_8 = ["v1_6"]
v1_10 = ["v1_8"]
v1_12 = ["v1_10"]
v1_12_1 = ["v1_12"]
dox = []
[lib]

4
gstreamer-base-sys/build.rs
View file

@ -16,7 +16,9 @@ fn main() {
fn find() -> Result<(), Error> {
let package_name = "gstreamer-base-1.0";
let shared_libs = ["gstbase-1.0"];
let version = if cfg!(feature = "v1_12") {
let version = if cfg!(feature = "v1_12_1") {
"1.12.1"
} else if cfg!(feature = "v1_12") {
"1.12"
} else if cfg!(feature = "v1_10") {
"1.10"

4
gstreamer-base-sys/src/lib.rs
View file

@ -564,13 +564,13 @@ extern "C" {
pub fn gst_flow_combiner_clear(combiner: *mut GstFlowCombiner);
#[cfg(any(feature = "v1_4", feature = "dox"))]
pub fn gst_flow_combiner_free(combiner: *mut GstFlowCombiner);
#[cfg(any(feature = "v1_4", feature = "dox"))]
#[cfg(any(feature = "v1_12_1", feature = "dox"))]
pub fn gst_flow_combiner_ref(combiner: *mut GstFlowCombiner) -> *mut GstFlowCombiner;
#[cfg(any(feature = "v1_4", feature = "dox"))]
pub fn gst_flow_combiner_remove_pad(combiner: *mut GstFlowCombiner, pad: *mut gst::GstPad);
#[cfg(any(feature = "v1_6", feature = "dox"))]
pub fn gst_flow_combiner_reset(combiner: *mut GstFlowCombiner);
#[cfg(any(feature = "v1_4", feature = "dox"))]
#[cfg(any(feature = "v1_12_1", feature = "dox"))]
pub fn gst_flow_combiner_unref(combiner: *mut GstFlowCombiner);
#[cfg(any(feature = "v1_4", feature = "dox"))]
pub fn gst_flow_combiner_update_flow(combiner: *mut GstFlowCombiner, fret: gst::GstFlowReturn) -> gst::GstFlowReturn;