summaryrefslogtreecommitdiffstats
path: root/ext/faad
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-11-07 18:30:06 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-11-07 18:30:06 +0000
commit868291efc42d7b66bfdafe0eded0b38ccad0b3b1 (patch)
treee92a7f534e4ae857d36efd030646bee667f613ba /ext/faad
parentc69f0127dfa452cedddc8e87e28b59e41eea4d9a (diff)
downloadgst-plugins-bad-868291efc42d7b66bfdafe0eded0b38ccad0b3b1.tar.gz
gst-plugins-bad-868291efc42d7b66bfdafe0eded0b38ccad0b3b1.tar.bz2
gst-plugins-bad-868291efc42d7b66bfdafe0eded0b38ccad0b3b1.zip
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().
Diffstat (limited to 'ext/faad')
-rw-r--r--ext/faad/gstfaad.c18
1 files changed, 8 insertions, 10 deletions
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 <rbultje@ronald.bitfreak.net>",
- };
+ static GstElementDetails gst_faad_details =
+ GST_ELEMENT_DETAILS ("Free AAC Decoder (FAAD)",
+ "Codec/Decoder/Audio",
+ "Free MPEG-2/4 AAC decoder",
+ "Ronald Bultje <rbultje@ronald.bitfreak.net>");
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_pad_template (element_class,