From 4abb85e5bf4c7c05e7fd29f4f6a2cbd553e5f6d1 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 13 Oct 2003 17:54:05 +0000 Subject: no, we don't require bytestream anymore Original commit message from CVS: no, we don't require bytestream anymore --- ext/mplex/gstmplex.cc | 4 ++-- gst/modplug/Makefile.am | 3 +-- gst/modplug/gstmodplug.cc | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 8f8a94a3d..523cc74fe 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -578,8 +578,8 @@ plugin_init (GModule *module, GstPlugin *plugin) GstElementFactory *factory; /* this filter needs the bytestream package */ - if (!gst_library_load ("gstbytestream")) - return FALSE; +/* if (!gst_library_load ("gstbytestream")) + return FALSE;*/ /* create an elementfactory for the avi_demux element */ factory = gst_element_factory_new ("mplex",GST_TYPE_MPLEX, diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am index 4738dbb11..52d9d4084 100644 --- a/gst/modplug/Makefile.am +++ b/gst/modplug/Makefile.am @@ -3,8 +3,7 @@ SUBDIRS=libmodplug . plugin_LTLIBRARIES = libgstmodplug.la libgstmodplug_la_SOURCES = modplug_types.cc gstmodplug.cc -libgstmodplug_la_CPPFLAGS = $(GST_CFLAGS) -libgstmodplug_la_CXXFLAGS = $(libgstmodplug_la_CPPFLAGS) +libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS) libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc index fb3cd24e9..0401a6c64 100644 --- a/gst/modplug/gstmodplug.cc +++ b/gst/modplug/gstmodplug.cc @@ -862,8 +862,8 @@ plugin_init (GModule *module, GstPlugin *plugin) guint i; /* this filter needs the bytestream package */ - if (!gst_library_load ("gstbytestream")) - return FALSE; +/* if (!gst_library_load ("gstbytestream")) + return FALSE;*/ factory = gst_element_factory_new ("modplug", GST_TYPE_MODPLUG, &modplug_details); g_return_val_if_fail (factory != NULL, FALSE); -- cgit v1.2.1