diff options
| author | Christian Schaller <uraeus@gnome.org> | 2005-05-06 14:54:23 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2005-05-06 14:54:23 +0000 |
| commit | 67802e804865cea6d1fa6e867086830b1d7645cc (patch) | |
| tree | 886f3b42b33d76bbf0bf5804871f84c70fa464b8 /gst | |
| parent | d7ccf497a9962bf322c4a3800448bd438c8cfee3 (diff) | |
make mad and effectv work with gst-register
Original commit message from CVS:
make mad and effectv work with gst-register
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/effectv/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/effectv/gsteffectv.c | 3 | ||||
| -rw-r--r-- | gst/videofilter/Makefile.am | 21 |
3 files changed, 11 insertions, 15 deletions
diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am index 2c3af0da..26b61be7 100644 --- a/gst/effectv/Makefile.am +++ b/gst/effectv/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgsteffectv.la libgsteffectv_la_SOURCES = gsteffectv.c gstedge.c gstaging.c gstdice.c gstwarp.c gstshagadelic.c gstvertigo.c gstrev.c gstquark.c libgsteffectv_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/videofilter -libgsteffectv_la_LIBADD = +libgsteffectv_la_LIBADD = $(top_builddir)/gst/videofilter/libgstvideofilter.la libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gsteffectv.h diff --git a/gst/effectv/gsteffectv.c b/gst/effectv/gsteffectv.c index c05e151c..f7aa6246 100644 --- a/gst/effectv/gsteffectv.c +++ b/gst/effectv/gsteffectv.c @@ -68,9 +68,6 @@ plugin_init (GstPlugin * plugin) { gint i = 0; - if (!gst_library_load ("gstvideofilter")) - return FALSE; - while (_elements[i].name) { if (!gst_element_register (plugin, _elements[i].name, GST_RANK_NONE, (_elements[i].type) ())) diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am index 985ae2fa..9171d5b1 100644 --- a/gst/videofilter/Makefile.am +++ b/gst/videofilter/Makefile.am @@ -1,9 +1,8 @@ -plugin_LTLIBRARIES = libgstvideofilter.la libgstvideoflip.la \ - libgstgamma.la +plugin_LTLIBRARIES = libgstvideofilter.la noinst_LTLIBRARIES = libgstvideoexample.la -noinst_HEADERS = gstvideofilter.h gstvideoflip.h +noinst_HEADERS = gstvideofilter.h EXTRA_DIST = gstvideotemplate.c make_filter CLEANFILES = gstvideoexample.c @@ -18,20 +17,20 @@ libgstvideoexample_la_CFLAGS = $(GST_CFLAGS) libgstvideoexample_la_LIBADD = libgstvideoexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstvideoflip_la_SOURCES = gstvideoflip.c -libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) -libgstvideoflip_la_LIBADD = -libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +# libgstvideoflip_la_SOURCES = gstvideoflip.c +# libgstvideoflip_la_CFLAGS = $(GST_CFLAGS) +# libgstvideoflip_la_LIBADD = +# libgstvideoflip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # libgstvideobalance_la_SOURCES = gstvideobalance.c # libgstvideobalance_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) # libgstvideobalance_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la # libgstvideobalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS) -lm -libgstgamma_la_SOURCES = gstgamma.c -libgstgamma_la_CFLAGS = $(GST_CFLAGS) -libgstgamma_la_LIBADD = -libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm +# libgstgamma_la_SOURCES = gstgamma.c +# libgstgamma_la_CFLAGS = $(GST_CFLAGS) +# libgstgamma_la_LIBADD = +# libgstgamma_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -lm gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c $(srcdir)/make_filter Videoexample $(srcdir)/gstvideotemplate.c |