summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2009-11-26 17:04:43 +0100
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2009-12-08 16:05:26 +0100
commite3e4ba4f9edf0ded4f346b601805fcb721914b16 (patch)
tree5cd046fc53ecca6f10c88617a0f33283eed3df76
parentd80b3e2f3b4f14ac37bf38d38d8486fd3b61caf1 (diff)
aacparse: separate plugin registration and rename plugin
-rw-r--r--gst/aacparse/Makefile.am2
-rw-r--r--gst/aacparse/gstaacparse.c21
-rw-r--r--gst/aacparse/plugin.c42
3 files changed, 43 insertions, 22 deletions
diff --git a/gst/aacparse/Makefile.am b/gst/aacparse/Makefile.am
index 1341e8dd6..f1f8f7c5a 100644
--- a/gst/aacparse/Makefile.am
+++ b/gst/aacparse/Makefile.am
@@ -1,7 +1,7 @@
plugin_LTLIBRARIES = libgstaacparse.la
libgstaacparse_la_SOURCES = \
- gstaacparse.c gstbaseparse.c
+ gstaacparse.c gstbaseparse.c plugin.c
libgstaacparse_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstaacparse_la_LIBADD = $(GST_BASE_LIBS)
diff --git a/gst/aacparse/gstaacparse.c b/gst/aacparse/gstaacparse.c
index a85b1e707..56fe64743 100644
--- a/gst/aacparse/gstaacparse.c
+++ b/gst/aacparse/gstaacparse.c
@@ -690,24 +690,3 @@ gst_aacparse_is_seekable (GstBaseParse * parse)
/* Not seekable if ADIF header is found */
return (aacparse->header_type != DSPAAC_HEADER_ADIF);
}
-
-
-/**
- * plugin_init:
- * @plugin: GstPlugin
- *
- * Returns: TRUE on success.
- */
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
- return gst_element_register (plugin, "aacparse",
- GST_RANK_NONE, GST_TYPE_AACPARSE);
-}
-
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "aacparse",
- "Advanced Audio Coding Parser",
- plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/aacparse/plugin.c b/gst/aacparse/plugin.c
new file mode 100644
index 000000000..caab51c5f
--- /dev/null
+++ b/gst/aacparse/plugin.c
@@ -0,0 +1,42 @@
+/* GStreamer audio parsers
+ * Copyright (C) 2009 Tim-Philipp Müller <tim centricular net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstaacparse.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+ gboolean ret;
+
+ ret = gst_element_register (plugin, "aacparse",
+ GST_RANK_NONE, GST_TYPE_AACPARSE);
+
+ return ret;
+}
+
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+ GST_VERSION_MINOR,
+ "audioparsersbad",
+ "audioparsers",
+ plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);