summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2010-01-14 11:50:33 +0100
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2010-01-27 12:45:57 +0100
commit87eb6333dac4eb972b732e9a221d5cdb54237f57 (patch)
tree2bf604c65bdb7dd29d35546af17e5223cad3d211
parentdf4c4cc703cd4113113adaebe07454650befab1e (diff)
audioparsers: rename baseparse GType name to avoid possible conflicts
-rw-r--r--docs/plugins/gst-plugins-bad-plugins.hierarchy2
-rw-r--r--gst/audioparsers/gstbaseparse.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index 6fcfb9a49..95bb1f6a4 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -415,7 +415,7 @@ GObject
GstSpeed
GstInputSelector
GstOutputSelector
- GstBaseParse
+ GstAudioBaseParseBad
GstAacParse
GstAmrParse
GstAc3Parse
diff --git a/gst/audioparsers/gstbaseparse.c b/gst/audioparsers/gstbaseparse.c
index 9a9b98849..4c9468c4b 100644
--- a/gst/audioparsers/gstbaseparse.c
+++ b/gst/audioparsers/gstbaseparse.c
@@ -267,7 +267,7 @@ gst_base_parse_get_type (void)
};
base_parse_type = g_type_register_static (GST_TYPE_ELEMENT,
- "GstBaseParse", &base_parse_info, G_TYPE_FLAG_ABSTRACT);
+ "GstAudioBaseParseBad", &base_parse_info, G_TYPE_FLAG_ABSTRACT);
}
return base_parse_type;
}