From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 14 Jan 2010 10:50:33 +0000 (+0100)
Subject: audioparsers: rename baseparse GType name to avoid possible conflicts
X-Git-Tag: 1.19.3~507^2~17512
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87eb6333dac4eb972b732e9a221d5cdb54237f57;p=platform%2Fupstream%2Fgstreamer.git

audioparsers: rename baseparse GType name to avoid possible conflicts
---

diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index 6fcfb9a..95bb1f6 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 9a9b988..4c9468c 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;
 }