mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

caps: _CAPS_FLAGS_ -> CAPS_FLAG_

Browse source
This commit is contained in:
Wim Taymans 2011-11-28 14:24:16 +01:00
parent da74724fd5
commit 5a4957eef6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/gstcaps.c
View file

@ -85,7 +85,7 @@
/* same as gst_caps_is_any () */
#define CAPS_IS_ANY(caps) \
(GST_CAPS_FLAGS(caps) & GST_CAPS_FLAGS_ANY)
(GST_CAPS_FLAGS(caps) & GST_CAPS_FLAG_ANY)
/* same as gst_caps_is_empty () */
#define CAPS_IS_EMPTY(caps) \
@ -227,7 +227,7 @@ gst_caps_new_any (void)
{
GstCaps *caps = gst_caps_new_empty ();
GST_CAPS_FLAG_SET (caps, GST_CAPS_FLAGS_ANY);
GST_CAPS_FLAG_SET (caps, GST_CAPS_FLAG_ANY);
return caps;
}
@ -508,7 +508,7 @@ gst_caps_append (GstCaps * caps1, GstCaps * caps2)
if (G_UNLIKELY (CAPS_IS_ANY (caps1) || CAPS_IS_ANY (caps2))) {
/* FIXME: this leaks */
GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAGS_ANY;
GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAG_ANY;
for (i = GST_CAPS_LEN (caps2) - 1; i >= 0; i--) {
structure = gst_caps_remove_and_get_structure (caps2, i);
gst_structure_free (structure);
@ -552,7 +552,7 @@ gst_caps_merge (GstCaps * caps1, GstCaps * caps2)
gst_structure_free (structure);
}
} else if (G_UNLIKELY (CAPS_IS_ANY (caps2))) {
GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAGS_ANY;
GST_CAPS_FLAGS (caps1) |= GST_CAPS_FLAG_ANY;
for (i = GST_CAPS_LEN (caps1) - 1; i >= 0; i--) {
structure = gst_caps_remove_and_get_structure (caps1, i);
gst_structure_free (structure);
@ -1940,7 +1940,7 @@ gst_caps_from_string_inplace (GstCaps * caps, const gchar * string)
gchar *s;
if (strcmp ("ANY", string) == 0) {
GST_CAPS_FLAGS (caps) = GST_CAPS_FLAGS_ANY;
GST_CAPS_FLAGS (caps) = GST_CAPS_FLAG_ANY;
return TRUE;
}
if (strcmp ("EMPTY", string) == 0) {

4
gst/gstcaps.h
View file

@ -38,13 +38,13 @@ extern GType _gst_caps_type;
/**
* GstCapsFlags:
* @GST_CAPS_FLAGS_ANY: Caps has no specific content, but can contain
* @GST_CAPS_FLAG_ANY: Caps has no specific content, but can contain
* anything.
*
* Extra flags for a caps.
*/
typedef enum {
GST_CAPS_FLAGS_ANY = (GST_MINI_OBJECT_FLAG_LAST << 0)
GST_CAPS_FLAG_ANY = (GST_MINI_OBJECT_FLAG_LAST << 0)
} GstCapsFlags;
/**