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

gst/gstcaps.c: only simplify in functions that create new caps. Simplifying in gst_caps_append breaks tests.

Browse source 
Original commit message from CVS:
* gst/gstcaps.c: (gst_caps_append), (gst_caps_intersect),
(gst_caps_union):
only simplify in functions that create new caps. Simplifying in
gst_caps_append breaks tests.
This commit is contained in:
Benjamin Otte 2004-04-22 04:29:18 +00:00
parent a79d06fe59
commit ef64b87987
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-04-22 Benjamin Otte <otte@gnome.org>
* gst/gstcaps.c: (gst_caps_append), (gst_caps_intersect),
(gst_caps_union):
only simplify in functions that create new caps. Simplifying in
gst_caps_append breaks tests.
2004-04-22 Benjamin Otte <otte@gnome.org> 2004-04-22 Benjamin Otte <otte@gnome.org>
* gst/gstcaps.c: (gst_caps_structure_simplify): * gst/gstcaps.c: (gst_caps_structure_simplify):

16
gst/gstcaps.c
View file

@ -298,7 +298,6 @@ gst_caps_append (GstCaps * caps1, GstCaps * caps2)
structure = gst_caps_get_structure (caps2, i); structure = gst_caps_get_structure (caps2, i);
gst_caps_append_structure (caps1, structure); gst_caps_append_structure (caps1, structure);
} }
gst_caps_do_simplify (caps1);
} }
g_ptr_array_free (caps2->structs, TRUE); g_ptr_array_free (caps2->structs, TRUE);
#ifdef USE_POISONING #ifdef USE_POISONING
@ -869,10 +868,6 @@ gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2)
GstStructure *struct2; GstStructure *struct2;
GstCaps *dest; GstCaps *dest;
#if 0
GstCaps *caps;
#endif
g_return_val_if_fail (caps1 != NULL, NULL); g_return_val_if_fail (caps1 != NULL, NULL);
g_return_val_if_fail (caps2 != NULL, NULL); g_return_val_if_fail (caps2 != NULL, NULL);
@ -897,14 +892,8 @@ gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2)
} }
} }
#if 0 gst_caps_do_simplify (dest);
caps = gst_caps_simplify (dest);
gst_caps_free (dest);
return caps;
#else
return dest; return dest;
#endif
} }
typedef struct typedef struct
@ -1019,8 +1008,7 @@ gst_caps_union (const GstCaps * caps1, const GstCaps * caps2)
dest2 = gst_caps_copy (caps2); dest2 = gst_caps_copy (caps2);
gst_caps_append (dest1, dest2); gst_caps_append (dest1, dest2);
/* FIXME: need a simplify function */ gst_caps_do_simplify (dest1);
return dest1; return dest1;
} }