mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 20:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

caps: small cleanups

Browse source
This commit is contained in:
Wim Taymans 2012-03-12 18:02:27 +01:00
parent 1bc93bbf8f
commit 4bbc3b6f04
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gst/gstcaps.c
View file

@ -606,29 +606,30 @@ gst_caps_remove_structure (GstCaps * caps, guint idx)
GstCaps *
gst_caps_merge_structure (GstCaps * caps, GstStructure * structure)
{
GstStructure *structure1;
int i;
gboolean unique = TRUE;
g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
if (G_LIKELY (structure)) {
GstStructure *structure1;
int i;
gboolean unique = TRUE;
if (G_UNLIKELY (structure == NULL))
return caps;
/* check each structure */
for (i = GST_CAPS_LEN (caps) - 1; i >= 0; i--) {
structure1 = gst_caps_get_structure_unchecked (caps, i);
/* if structure is a subset of structure1, then skip it */
if (gst_structure_is_subset (structure, structure1)) {
unique = FALSE;
break;
}
}
if (unique) {
caps = gst_caps_make_writable (caps);
gst_caps_append_structure_unchecked (caps, structure);
} else {
gst_structure_free (structure);
/* check each structure */
for (i = GST_CAPS_LEN (caps) - 1; i >= 0; i--) {
structure1 = gst_caps_get_structure_unchecked (caps, i);
/* if structure is a subset of structure1, then skip it */
if (gst_structure_is_subset (structure, structure1)) {
unique = FALSE;
break;
}
}
if (unique) {
caps = gst_caps_make_writable (caps);
gst_caps_append_structure_unchecked (caps, structure);
} else {
gst_structure_free (structure);
}
return caps;
}