mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-09-25 13:30:17 +00:00
Code Issues Projects Releases Wiki Activity

gstreamer/caps: Assert on ANY caps in fixate() and work around bug in handling EMPTY caps

Browse source 
See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/388
This commit is contained in:
Sebastian Dröge 2020-03-09 13:02:20 +02:00
parent 671605d8ac
commit 2599acc681
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gstreamer/src/caps.rs
View file

@ -72,7 +72,16 @@ impl Caps {
pub fn fixate(caps: Self) -> Self { pub fn fixate(caps: Self) -> Self {
skip_assert_initialized!(); skip_assert_initialized!();
unsafe { from_glib_full(gst_sys::gst_caps_fixate(caps.into_ptr())) } unsafe {
// See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/388
assert!(!caps.is_any());
let ptr = if caps.is_empty() {
gst_sys::gst_caps_new_empty()
} else {
gst_sys::gst_caps_fixate(caps.into_ptr())
};
from_glib_full(ptr)
}
} }
pub fn merge(caps: Self, other: Self) -> Self { pub fn merge(caps: Self, other: Self) -> Self {