diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2006-08-21 14:54:31 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2006-08-21 14:54:31 +0000 |
| commit | 38d2d33f22361778bcfe4d2f48510a7e491059c0 (patch) | |
| tree | 63742d63943607b3fd3e92f23da4de7870f7fb23 /libs | |
| parent | 9c590b226e5afd68b3f8f2d89086b66667b9cdc4 (diff) | |
API: Add gst_caps_merge() and use it in basetransform, fixes #345444 in a better way
Original commit message from CVS:
* docs/gst/gstreamer-sections.txt:
* gst/gstcaps.c: (gst_structure_is_equal_foreach),
(gst_caps_merge):
* gst/gstcaps.h:
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_transform_caps):
API: Add gst_caps_merge() and use it in basetransform, fixes #345444
in a better way
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gst/base/gstbasetransform.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index 2d2b014e3..48c1d6819 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -456,12 +456,14 @@ gst_base_transform_transform_caps (GstBaseTransform * trans, /* FIXME: here we need to only append those structures, that are not yet * in there */ temp = gst_caps_make_writable (temp); - gst_caps_append (ret, temp); + /*gst_caps_append (ret, temp); */ + gst_caps_merge (ret, temp); } - /* for now simplify caps */ GST_DEBUG_OBJECT (trans, "merged: (%d)", gst_caps_get_size (ret)); - gst_caps_do_simplify (ret); - GST_DEBUG_OBJECT (trans, "simplified: (%d)", gst_caps_get_size (ret)); + /* now simplify caps + gst_caps_do_simplify (ret); + GST_DEBUG_OBJECT (trans, "simplified: (%d)", gst_caps_get_size (ret)); + */ } } else { /* else use the identity transform */ |