summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@greynoise.nl>2013-01-18 23:23:56 +0100
committerSjoerd Simons <sjoerd@luon.net>2013-02-11 22:04:59 +0100
commit6ce751442b50c1117092a3001cbd23a2a9def08e (patch)
treecf31616a214a9babf7cd7c55681bf6c1dfcb4aac /sys
parent0de5ad65f08f203df042ed14ee50d15122c6e49b (diff)
downloadgstreamer-plugins-bad-6ce751442b50c1117092a3001cbd23a2a9def08e.tar.gz
uvch264: Remove the _ from the element names
Rename uvch264_src to uvch264src and uvch264_mjpgdemux to uvch264mjpgdemux
Diffstat (limited to 'sys')
-rw-r--r--sys/uvch264/gstuvch264.c4
-rw-r--r--sys/uvch264/gstuvch264_mjpgdemux.c4
-rw-r--r--sys/uvch264/gstuvch264_src.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/uvch264/gstuvch264.c b/sys/uvch264/gstuvch264.c
index 96f544f99..d98d8f917 100644
--- a/sys/uvch264/gstuvch264.c
+++ b/sys/uvch264/gstuvch264.c
@@ -32,11 +32,11 @@
static gboolean
plugin_init (GstPlugin * plugin)
{
- if (!gst_element_register (plugin, "uvch264_mjpgdemux", GST_RANK_NONE,
+ if (!gst_element_register (plugin, "uvch264mjpgdemux", GST_RANK_NONE,
GST_TYPE_UVC_H264_MJPG_DEMUX))
return FALSE;
- if (!gst_element_register (plugin, "uvch264_src", GST_RANK_NONE,
+ if (!gst_element_register (plugin, "uvch264src", GST_RANK_NONE,
GST_TYPE_UVC_H264_SRC))
return FALSE;
diff --git a/sys/uvch264/gstuvch264_mjpgdemux.c b/sys/uvch264/gstuvch264_mjpgdemux.c
index 28f9ce5d5..8a5dd2fe1 100644
--- a/sys/uvch264/gstuvch264_mjpgdemux.c
+++ b/sys/uvch264/gstuvch264_mjpgdemux.c
@@ -22,7 +22,7 @@
*/
/**
- * SECTION:element-uvch264-mjpgdemux
+ * SECTION:element-uvch264mjpgdemux
* @short_description: UVC H264 compliant MJPG demuxer
*
* Parses a MJPG stream from a UVC H264 compliant encoding camera and extracts
@@ -221,7 +221,7 @@ gst_uvc_h264_mjpg_demux_class_init (GstUvcH264MjpgDemuxClass * klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
GST_DEBUG_CATEGORY_INIT (uvc_h264_mjpg_demux_debug,
- "uvch264_mjpgdemux", 0, "UVC H264 MJPG Demuxer");
+ "uvch264mjpgdemux", 0, "UVC H264 MJPG Demuxer");
}
static void
diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c
index 1e8e1319b..4d2231769 100644
--- a/sys/uvch264/gstuvch264_src.c
+++ b/sys/uvch264/gstuvch264_src.c
@@ -265,7 +265,7 @@ gst_uvc_h264_src_class_init (GstUvcH264SrcClass * klass)
gstbasecamerasrc_class->start_capture = gst_uvc_h264_src_start_capture;
gstbasecamerasrc_class->stop_capture = gst_uvc_h264_src_stop_capture;
- GST_DEBUG_CATEGORY_INIT (uvc_h264_src_debug, "uvch264_src",
+ GST_DEBUG_CATEGORY_INIT (uvc_h264_src_debug, "uvch264src",
0, "UVC H264 Compliant camera bin source");
gst_element_class_set_static_metadata (gstelement_class,
@@ -2753,7 +2753,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
break;
case H264_JPG:
GST_DEBUG_OBJECT (self, "H264+JPG");
- self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+ self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
if (!self->mjpg_demux || !gst_bin_add (GST_BIN (self), self->mjpg_demux))
goto error_remove;
gst_object_ref (self->mjpg_demux);
@@ -2767,7 +2767,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
break;
case H264_RAW:
GST_DEBUG_OBJECT (self, "H264+Raw");
- self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+ self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
self->vf_colorspace = gst_element_factory_make (self->colorspace_name,
NULL);
if (!self->mjpg_demux || !self->vf_colorspace)
@@ -2794,7 +2794,7 @@ gst_uvc_h264_src_construct_pipeline (GstBaseCameraSrc * bcamsrc)
break;
case H264_JPG2RAW:
GST_DEBUG_OBJECT (self, "H264+Raw(jpegdec)");
- self->mjpg_demux = gst_element_factory_make ("uvch264_mjpgdemux", NULL);
+ self->mjpg_demux = gst_element_factory_make ("uvch264mjpgdemux", NULL);
self->jpeg_dec = gst_element_factory_make (self->jpeg_decoder_name, NULL);
self->vf_colorspace = gst_element_factory_make (self->colorspace_name,
NULL);