From 868291efc42d7b66bfdafe0eded0b38ccad0b3b1 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 7 Nov 2004 18:30:06 +0000 Subject: Add musepack decoder. Original commit message from CVS: * configure.ac: * ext/Makefile.am: * ext/musepack/Makefile.am: * ext/musepack/gstmusepackdec.cpp: * ext/musepack/gstmusepackdec.h: * ext/musepack/gstmusepackreader.cpp: * ext/musepack/gstmusepackreader.h: Add musepack decoder. * ext/faad/gstfaad.c: (gst_faad_base_init): Make pad templates static. * gst/typefind/gsttypefindfunctions.c: (mp3_type_find), (plugin_init): Add musepack typefinder, make mp3 typefinding work halfway stream, which doesn't actually work yet because id3demux doesn't implement _get_length(). --- ext/faad/gstfaad.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'ext/faad') diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index 04bf6e3c..883790e2 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -25,14 +25,13 @@ #include "gstfaad.h" -GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", +static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/mpeg, " - "systemstream = (bool) FALSE, " "mpegversion = { (int) 2, (int) 4 }") + GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) { 2, 4 }") ); -GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", +static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-raw-int, " @@ -92,12 +91,11 @@ gst_faad_get_type (void) static void gst_faad_base_init (GstFaadClass * klass) { - GstElementDetails gst_faad_details = { - "Free AAC Decoder (FAAD)", - "Codec/Decoder/Audio", - "Free MPEG-2/4 AAC decoder", - "Ronald Bultje ", - }; + static GstElementDetails gst_faad_details = + GST_ELEMENT_DETAILS ("Free AAC Decoder (FAAD)", + "Codec/Decoder/Audio", + "Free MPEG-2/4 AAC decoder", + "Ronald Bultje "); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_class, -- cgit v1.2.1