From 5845038a634ce63c83e2d2bfb7f9b8d78be79908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 3 Jul 2020 12:23:52 +0300 Subject: [PATCH] video: Use correct version for interlaced caps feature --- gstreamer-video/src/caps_features.rs | 2 ++ gstreamer-video/src/lib.rs | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gstreamer-video/src/caps_features.rs b/gstreamer-video/src/caps_features.rs index 6fa1b7092..3cc40233e 100644 --- a/gstreamer-video/src/caps_features.rs +++ b/gstreamer-video/src/caps_features.rs @@ -12,11 +12,13 @@ use std::ffi::CStr; use once_cell::sync::Lazy; +#[cfg(any(feature = "v1_16", feature = "dox"))] pub static CAPS_FEATURE_FORMAT_INTERLACED: Lazy<&'static str> = Lazy::new(|| unsafe { CStr::from_ptr(gst_video_sys::GST_CAPS_FEATURE_FORMAT_INTERLACED) .to_str() .unwrap() }); +#[cfg(any(feature = "v1_16", feature = "dox"))] pub static CAPS_FEATURES_FORMAT_INTERLACED: Lazy = Lazy::new(|| CapsFeatures::new(&[*CAPS_FEATURE_FORMAT_INTERLACED])); diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index 8ba2f7d80..036bb8292 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -46,10 +46,12 @@ mod auto; pub use auto::*; mod caps_features; +#[cfg(any(feature = "v1_16", feature = "dox"))] +pub use caps_features::{CAPS_FEATURES_FORMAT_INTERLACED, CAPS_FEATURE_FORMAT_INTERLACED}; pub use caps_features::{ - CAPS_FEATURES_FORMAT_INTERLACED, CAPS_FEATURES_META_GST_VIDEO_AFFINE_TRANSFORMATION_META, + CAPS_FEATURES_META_GST_VIDEO_AFFINE_TRANSFORMATION_META, CAPS_FEATURES_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, CAPS_FEATURES_META_GST_VIDEO_META, - CAPS_FEATURES_META_GST_VIDEO_OVERLAY_COMPOSITION, CAPS_FEATURE_FORMAT_INTERLACED, + CAPS_FEATURES_META_GST_VIDEO_OVERLAY_COMPOSITION, CAPS_FEATURE_META_GST_VIDEO_AFFINE_TRANSFORMATION_META, CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, CAPS_FEATURE_META_GST_VIDEO_META, CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION,