summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-11-25 10:12:09 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-11-25 10:12:09 +0000
commit37d4958fca4e27134c8da5cd47e4253a8cb74763 (patch)
treeba5e52a6554e5048d6a2d7039977de986581b942
parent50841996be64a7b4697d3e30a45ca68db459762e (diff)
downloadgst-plugins-bad-37d4958fca4e27134c8da5cd47e4253a8cb74763.tar.gz
gst-plugins-bad-37d4958fca4e27134c8da5cd47e4253a8cb74763.tar.bz2
gst-plugins-bad-37d4958fca4e27134c8da5cd47e4253a8cb74763.zip
ext/dc1394/gstdc1394.c: Set initial structure name to fix assertion, due to recent caps name constraints.
Original commit message from CVS: * ext/dc1394/gstdc1394.c: Set initial structure name to fix assertion, due to recent caps name constraints.
-rw-r--r--ChangeLog6
-rw-r--r--ext/dc1394/gstdc1394.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c10737f..07652e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-25 Stefan Kost <ensonic@users.sf.net>
+
+ * ext/dc1394/gstdc1394.c:
+ Set initial structure name to fix assertion, due to recent caps name
+ constraints.
+
2007-11-23 Zaheer Abbas Merali <zaheerabbas at merali dot org>
patch by: Alessandro Decina
diff --git a/ext/dc1394/gstdc1394.c b/ext/dc1394/gstdc1394.c
index 190a0df8..c9d6dc90 100644
--- a/ext/dc1394/gstdc1394.c
+++ b/ext/dc1394/gstdc1394.c
@@ -793,7 +793,7 @@ gst_dc1394_get_all_dc1394_caps ()
gcaps = gst_caps_new_empty ();
// first, the fixed mode caps
for (i = DC1394_VIDEO_MODE_MIN; i < DC1394_VIDEO_MODE_EXIF; i++) {
- GstStructure *gs = gst_structure_empty_new ("");
+ GstStructure *gs = gst_structure_empty_new ("video");
gint ret = gst_dc1394_caps_set_format_vmode_caps (gs, i);
gst_structure_set (gs,
@@ -807,7 +807,7 @@ gst_dc1394_get_all_dc1394_caps ()
// then Format 7 options
for (i = DC1394_COLOR_CODING_MIN; i <= DC1394_COLOR_CODING_MAX; i++) {
- GstStructure *gs = gst_structure_empty_new ("");
+ GstStructure *gs = gst_structure_empty_new ("video");
//int ret = gst_dc1394_caps_set_format_vmode_caps(gs, i);
@@ -1216,7 +1216,6 @@ gst_dc1394_change_camera_transmission (GstDc1394 * src, gboolean on)
static gboolean
plugin_init (GstPlugin * plugin)
{
-
GST_DEBUG_CATEGORY_INIT (dc1394_debug, "dc1394", 0, "DC1394 interface");
return gst_element_register (plugin, "dc1394src", GST_RANK_NONE,