From a85b30eacbc1f06433d45ff72f66ad592e41b221 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Sat, 17 Apr 2021 12:11:52 +0200 Subject: [PATCH] audio,video: Remove dox feature from function bodies Now that the crates are generated and linked against v1_20 binaries there is no need to guard this codepath when building `dox` (which inherently enables `v1_20` but did previously not actually compile against that version yet). --- gstreamer-audio/src/audio_format_info.rs | 2 +- gstreamer-video/src/video_info.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gstreamer-audio/src/audio_format_info.rs b/gstreamer-audio/src/audio_format_info.rs index f23c72845..43680adce 100644 --- a/gstreamer-audio/src/audio_format_info.rs +++ b/gstreamer-audio/src/audio_format_info.rs @@ -174,7 +174,7 @@ impl AudioFormatInfo { unsafe { cfg_if::cfg_if! { - if #[cfg(all(feature = "v1_20", not(feature = "dox")))] { + if #[cfg(feature = "v1_20")] { ffi::gst_audio_format_info_fill_silence(self.0, dest.as_mut_ptr() as *mut _, dest.len()) } else { ffi::gst_audio_format_fill_silence(self.0, dest.as_mut_ptr() as *mut _, dest.len()) diff --git a/gstreamer-video/src/video_info.rs b/gstreamer-video/src/video_info.rs index b0a76b697..ecb614f7e 100644 --- a/gstreamer-video/src/video_info.rs +++ b/gstreamer-video/src/video_info.rs @@ -185,7 +185,7 @@ impl crate::VideoChromaSite { unsafe { cfg_if::cfg_if! { - if #[cfg(all(feature = "v1_20", not(feature = "dox")))] { + if #[cfg(feature = "v1_20")] { from_glib_full(ffi::gst_video_chroma_site_to_string(self.into_glib())) } else { from_glib_none(ffi::gst_video_chroma_to_string(self.into_glib())) @@ -203,7 +203,7 @@ impl str::FromStr for crate::VideoChromaSite { skip_assert_initialized!(); cfg_if::cfg_if! { - if #[cfg(all(feature = "v1_20", not(feature = "dox")))] { + if #[cfg(feature = "v1_20")] { let chroma_site = Self::from_string(s); } else { assert_initialized_main_thread!();