mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "aiff: Disable aiff muxer for this release."

Browse source 
This reverts commit 7426be70ff.

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.
This commit is contained in:
Jan Schmidt 2009-11-18 02:04:19 +00:00
parent 48a2bbd6ad
commit 2b25e97bef
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/aiff/Makefile.am
View file

@ -1,6 +1,6 @@
plugin_LTLIBRARIES = libgstaiff.la plugin_LTLIBRARIES = libgstaiff.la
libgstaiff_la_SOURCES = aiff.c aiffparse.c libgstaiff_la_SOURCES = aiff.c aiffmux.c aiffparse.c
libgstaiff_la_CFLAGS = \ libgstaiff_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
@ -12,4 +12,3 @@ libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = aiffmux.h aiffparse.h noinst_HEADERS = aiffmux.h aiffparse.h
EXTRA_DIST = aiffmux.c

6
gst/aiff/aiff.c
View file

@ -31,7 +31,7 @@ GST_DEBUG_CATEGORY_STATIC (aiff_debug);
#define GST_CAT_DEFAULT (aiff_debug) #define GST_CAT_DEFAULT (aiff_debug)
GST_DEBUG_CATEGORY_EXTERN (aiffparse_debug); GST_DEBUG_CATEGORY_EXTERN (aiffparse_debug);
/* GST_DEBUG_CATEGORY_EXTERN (aiffmux_debug); */ GST_DEBUG_CATEGORY_EXTERN (aiffmux_debug);
static gboolean static gboolean
plugin_init (GstPlugin * plugin) 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 (aiff_debug, "aiff", 0, "AIFF plugin");
GST_DEBUG_CATEGORY_INIT (aiffparse_debug, "aiffparse", 0, "AIFF parser"); 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 #ifdef ENABLE_NLS
GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, 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, ret = gst_element_register (plugin, "aiffparse", GST_RANK_PRIMARY,
GST_TYPE_AIFF_PARSE); GST_TYPE_AIFF_PARSE);
/*
ret &= gst_element_register (plugin, "aiffmux", GST_RANK_NONE, ret &= gst_element_register (plugin, "aiffmux", GST_RANK_NONE,
GST_TYPE_AIFF_MUX); GST_TYPE_AIFF_MUX);
*/
return ret; return ret;
} }