summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2003-10-13 17:54:05 +0000
committerBenjamin Otte <otte@gnome.org>2003-10-13 17:54:05 +0000
commit4abb85e5bf4c7c05e7fd29f4f6a2cbd553e5f6d1 (patch)
tree87c03967526b062b34b65486e3927d4ace0b696a
parent62c7ce69c9d83c7d5b1264bf39268cb3962685ef (diff)
downloadgst-plugins-bad-4abb85e5bf4c7c05e7fd29f4f6a2cbd553e5f6d1.tar.gz
gst-plugins-bad-4abb85e5bf4c7c05e7fd29f4f6a2cbd553e5f6d1.tar.bz2
gst-plugins-bad-4abb85e5bf4c7c05e7fd29f4f6a2cbd553e5f6d1.zip
no, we don't require bytestream anymore
Original commit message from CVS: no, we don't require bytestream anymore
-rw-r--r--ext/mplex/gstmplex.cc4
-rw-r--r--gst/modplug/Makefile.am3
-rw-r--r--gst/modplug/gstmodplug.cc4
3 files changed, 5 insertions, 6 deletions
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index 8f8a94a3..523cc74f 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 4738dbb1..52d9d408 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 fb3cd24e..0401a6c6 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);