From 939af8c2f8617e36cdd0c0936e77f7f9c23b123c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 2 Jul 2006 14:37:10 +0000 Subject: [PATCH] gst/gstcaps.c: remove gst_caps_simplify; it was not declared and not used and deprecated in 0.8 Original commit message from CVS: * gst/gstcaps.c: (gst_caps_remove_and_get_structure): remove gst_caps_simplify; it was not declared and not used and deprecated in 0.8 --- ChangeLog | 6 ++++++ common | 2 +- gst/gstcaps.c | 26 +------------------------- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index a97f479..38d01b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-07-02 Thomas Vander Stichele + * gst/gstcaps.c: (gst_caps_remove_and_get_structure): + remove gst_caps_simplify; it was not declared and not used + and deprecated in 0.8 + +2006-07-02 Thomas Vander Stichele + * docs/faq/gst-uninstalled: don't put empty paths on PYTHONPATH * docs/gst/gstreamer-sections.txt: diff --git a/common b/common index 2cd1cf8..9eb7943 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2cd1cf860cd15e61827c0f5f1db96f877344c722 +Subproject commit 9eb7943282c38c815cfbac34cff4062a94e72e62 diff --git a/gst/gstcaps.c b/gst/gstcaps.c index bebde26..3ad7b08 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -444,7 +444,7 @@ gst_static_caps_get (GstStaticCaps * static_caps) static GstStructure * gst_caps_remove_and_get_structure (GstCaps * caps, guint idx) { - /* don't use index_fast, gst_caps_simplify relies on the order */ + /* don't use index_fast, gst_caps_do_simplify relies on the order */ GstStructure *s = g_ptr_array_remove_index (caps->structs, idx); gst_structure_set_parent_refcount (s, NULL); @@ -1319,30 +1319,6 @@ gst_caps_compare_structures (gconstpointer one, gconstpointer two) return gst_structure_n_fields (struct2) - gst_structure_n_fields (struct1); } -/** - * gst_caps_simplify: - * @caps: a #GstCaps to simplify - * - * Creates a new #GstCaps that represents the same set of formats as - * @caps, but simpler. Component structures that are identical are - * merged. Component structures that have ranges or lists that can - * be merged are also merged. - * - * Returns: the new #GstCaps - */ -GstCaps * -gst_caps_simplify (const GstCaps * caps) -{ - GstCaps *ret; - - g_return_val_if_fail (caps != NULL, NULL); - - ret = gst_caps_copy (caps); - gst_caps_do_simplify (ret); - - return ret; -} - typedef struct { GQuark name; -- 2.7.4