diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-09-29 13:21:18 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-09-29 13:22:34 +0100 |
commit | f1f7171aa92964743578b73df3018275c74df492 (patch) | |
tree | dde79584efc88d50622e3b4257e4ae7f75299f90 /gst | |
parent | 4712247e4f54c51e718fb09319b5770dc33ace22 (diff) | |
download | gstreamer-plugins-bad-f1f7171aa92964743578b73df3018275c74df492.tar.gz |
frei0r: fix plugin loading for frei0r elements that have no info.explanation
We don't allow empty descriptions for elements any more.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/frei0r/gstfrei0rfilter.c | 6 | ||||
-rw-r--r-- | gst/frei0r/gstfrei0rmixer.c | 6 | ||||
-rw-r--r-- | gst/frei0r/gstfrei0rsrc.c | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/gst/frei0r/gstfrei0rfilter.c b/gst/frei0r/gstfrei0rfilter.c index 91d2fe484..99c12384d 100644 --- a/gst/frei0r/gstfrei0rfilter.c +++ b/gst/frei0r/gstfrei0rfilter.c @@ -185,6 +185,7 @@ gst_frei0r_filter_class_init (GstFrei0rFilterClass * klass, GstElementClass *gstelement_class = (GstElementClass *) klass; GstBaseTransformClass *gsttrans_class = (GstBaseTransformClass *) klass; GstPadTemplate *templ; + const gchar *desc; GstCaps *caps; gchar *author; @@ -205,8 +206,11 @@ gst_frei0r_filter_class_init (GstFrei0rFilterClass * klass, g_strdup_printf ("Sebastian Dröge <sebastian.droege@collabora.co.uk>, %s", class_data->info.author); + desc = class_data->info.explanation; + if (desc == NULL || *desc == '\0') + desc = "No details"; gst_element_class_set_metadata (gstelement_class, class_data->info.name, - "Filter/Effect/Video", class_data->info.explanation, author); + "Filter/Effect/Video", desc, author); g_free (author); caps = gst_frei0r_caps_from_color_model (class_data->info.color_model); diff --git a/gst/frei0r/gstfrei0rmixer.c b/gst/frei0r/gstfrei0rmixer.c index 490e8edb5..d3fe248ef 100644 --- a/gst/frei0r/gstfrei0rmixer.c +++ b/gst/frei0r/gstfrei0rmixer.c @@ -613,6 +613,7 @@ gst_frei0r_mixer_class_init (GstFrei0rMixerClass * klass, GObjectClass *gobject_class = (GObjectClass *) klass; GstElementClass *gstelement_class = (GstElementClass *) klass; GstPadTemplate *templ; + const gchar *desc; GstCaps *caps; gchar *author; @@ -633,8 +634,11 @@ gst_frei0r_mixer_class_init (GstFrei0rMixerClass * klass, g_strdup_printf ("Sebastian Dröge <sebastian.droege@collabora.co.uk>, %s", class_data->info.author); + desc = class_data->info.explanation; + if (desc == NULL || *desc == '\0') + desc = "No details"; gst_element_class_set_metadata (gstelement_class, class_data->info.name, - "Filter/Editor/Video", class_data->info.explanation, author); + "Filter/Editor/Video", desc, author); g_free (author); caps = gst_frei0r_caps_from_color_model (class_data->info.color_model); diff --git a/gst/frei0r/gstfrei0rsrc.c b/gst/frei0r/gstfrei0rsrc.c index c1d57a9b0..d7785a814 100644 --- a/gst/frei0r/gstfrei0rsrc.c +++ b/gst/frei0r/gstfrei0rsrc.c @@ -316,6 +316,7 @@ gst_frei0r_src_class_init (GstFrei0rSrcClass * klass, GstPushSrcClass *gstpushsrc_class = (GstPushSrcClass *) klass; GstBaseSrcClass *gstbasesrc_class = (GstBaseSrcClass *) klass; GstPadTemplate *templ; + const gchar *desc; GstCaps *caps; gchar *author; @@ -336,8 +337,11 @@ gst_frei0r_src_class_init (GstFrei0rSrcClass * klass, g_strdup_printf ("Sebastian Dröge <sebastian.droege@collabora.co.uk>, %s", class_data->info.author); + desc = class_data->info.explanation; + if (desc == NULL || *desc == '\0') + desc = "No details"; gst_element_class_set_metadata (gstelement_class, class_data->info.name, - "Src/Video", class_data->info.explanation, author); + "Src/Video", desc, author); g_free (author); caps = gst_frei0r_caps_from_color_model (class_data->info.color_model); |