diff options
-rw-r--r-- | ext/lcs/Makefile.am | 13 | ||||
-rw-r--r-- | ext/lcs/gstcolorspace.c | 2 | ||||
-rw-r--r-- | gst/colorspace/Makefile.am | 12 | ||||
-rw-r--r-- | gst/colorspace/gstcolorspace.c | 6 |
4 files changed, 14 insertions, 19 deletions
diff --git a/ext/lcs/Makefile.am b/ext/lcs/Makefile.am index 41d7e818..15a029ea 100644 --- a/ext/lcs/Makefile.am +++ b/ext/lcs/Makefile.am @@ -1,9 +1,6 @@ +plugin_LTLIBRARIES = libgstlcscolorspace.la -plugin_LTLIBRARIES = libgstcolorspacelcs.la - -libgstcolorspacelcs_la_SOURCES = gstcolorspace.c -libgstcolorspacelcs_la_CFLAGS = $(GST_CFLAGS) $(LCS_CFLAGS) -libgstcolorspacelcs_la_LIBADD = $(LCS_LIBS) -libgstcolorspacelcs_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -noinst_HEADERS = +libgstlcscolorspace_la_SOURCES = gstcolorspace.c +libgstlcscolorspace_la_CFLAGS = $(GST_CFLAGS) $(LCS_CFLAGS) +libgstlcscolorspace_la_LIBADD = $(LCS_LIBS) +libgstlcscolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c index 33ba1854..da17da25 100644 --- a/ext/lcs/gstcolorspace.c +++ b/ext/lcs/gstcolorspace.c @@ -484,6 +484,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "colorspacelcs", + "lcscolorspace", "LCS colorspace convertor", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) diff --git a/gst/colorspace/Makefile.am b/gst/colorspace/Makefile.am index 697c0a92..74d55a7b 100644 --- a/gst/colorspace/Makefile.am +++ b/gst/colorspace/Makefile.am @@ -1,5 +1,4 @@ - -plugin_LTLIBRARIES = libgstcolorspace.la +plugin_LTLIBRARIES = libgstyuvtorgbcolorspace.la if HAVE_CPU_I386 ARCHSRCS = yuv2rgb_mmx16.s @@ -7,10 +6,9 @@ else ARCHSRCS = endif -libgstcolorspace_la_SOURCES = gstcolorspace.c yuv2rgb.c -libgstcolorspace_la_CFLAGS = $(GST_CFLAGS) -libgstcolorspace_la_LIBADD = -libgstcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstyuvtorgbcolorspace_la_SOURCES = gstcolorspace.c yuv2rgb.c +libgstyuvtorgbcolorspace_la_CFLAGS = $(GST_CFLAGS) +libgstyuvtorgbcolorspace_la_LIBADD = +libgstyuvtorgbcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = yuv2rgb.h gstcolorspace.h - diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index 6b28d8fd..bbdf48b4 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -47,7 +47,7 @@ static GstColorspaceConverter gst_colorspace_converters[] = { static GstElementDetails colorspace_details = GST_ELEMENT_DETAILS ("Colorspace converter", "Filter/Converter/Video", - "Converts video from one colorspace to another", + "Converts video from YUV to RGB", "Wim Taymans <wim.taymans@chello.be>"); static GstStaticPadTemplate gst_colorspace_sink_template = @@ -625,6 +625,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "colorspace", - "internal colorspace converter", + "yuvtorgbcolorspace", + "YUV to RGB colorspace converter", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN) |