diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-11-18 02:04:19 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-11-18 03:10:31 +0000 |
| commit | 2b25e97befd97c21dfc5bc7ea130e1eb4f8d5562 (patch) | |
| tree | c97fcd2d2138876cee926460057aa87b0b23f7b7 /gst/aiff | |
| parent | 48a2bbd6ad982d92bfe797b18dcf99320dc99b21 (diff) | |
Revert "aiff: Disable aiff muxer for this release."
This reverts commit 7426be70ffb113f02e37407ea989e60b638b2f00.
Re-enable the aiff muxer now that gst-plugins-bad 0.10.17 is out
and we can rely on gst-plugins-base from git.
Diffstat (limited to 'gst/aiff')
| -rw-r--r-- | gst/aiff/Makefile.am | 3 | ||||
| -rw-r--r-- | gst/aiff/aiff.c | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am index d916b237a..5a693d4b5 100644 --- a/gst/aiff/Makefile.am +++ b/gst/aiff/Makefile.am @@ -1,6 +1,6 @@ plugin_LTLIBRARIES = libgstaiff.la -libgstaiff_la_SOURCES = aiff.c aiffparse.c +libgstaiff_la_SOURCES = aiff.c aiffmux.c aiffparse.c libgstaiff_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ @@ -12,4 +12,3 @@ libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = aiffmux.h aiffparse.h -EXTRA_DIST = aiffmux.c diff --git a/gst/aiff/aiff.c b/gst/aiff/aiff.c index 66af642e3..5dcb915cc 100644 --- a/gst/aiff/aiff.c +++ b/gst/aiff/aiff.c @@ -31,7 +31,7 @@ GST_DEBUG_CATEGORY_STATIC (aiff_debug); #define GST_CAT_DEFAULT (aiff_debug) GST_DEBUG_CATEGORY_EXTERN (aiffparse_debug); -/* GST_DEBUG_CATEGORY_EXTERN (aiffmux_debug); */ +GST_DEBUG_CATEGORY_EXTERN (aiffmux_debug); static gboolean plugin_init (GstPlugin * plugin) @@ -40,7 +40,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (aiff_debug, "aiff", 0, "AIFF plugin"); GST_DEBUG_CATEGORY_INIT (aiffparse_debug, "aiffparse", 0, "AIFF parser"); - /* GST_DEBUG_CATEGORY_INIT (aiffmux_debug, "aiffmux", 0, "AIFF muxer"); */ + GST_DEBUG_CATEGORY_INIT (aiffmux_debug, "aiffmux", 0, "AIFF muxer"); #ifdef ENABLE_NLS GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, @@ -51,10 +51,8 @@ plugin_init (GstPlugin * plugin) ret = gst_element_register (plugin, "aiffparse", GST_RANK_PRIMARY, GST_TYPE_AIFF_PARSE); - /* - ret &= gst_element_register (plugin, "aiffmux", GST_RANK_NONE, - GST_TYPE_AIFF_MUX); - */ + ret &= gst_element_register (plugin, "aiffmux", GST_RANK_NONE, + GST_TYPE_AIFF_MUX); return ret; } |