From 87eb6333dac4eb972b732e9a221d5cdb54237f57 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Thu, 14 Jan 2010 11:50:33 +0100
Subject: [PATCH] audioparsers: rename baseparse GType name to avoid possible
 conflicts

---
 docs/plugins/gst-plugins-bad-plugins.hierarchy | 2 +-
 gst/audioparsers/gstbaseparse.c                | 2 +-
 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 6fcfb9a493..95bb1f6a41 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 9a9b988497..4c9468c4b3 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;
 }