diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2object.c | 6 |
2 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2006-07-19 Tim-Philipp Müller <tim at centricular dot net> + Patch by: Martin Szulecki + + * sys/v4l2/gstv4l2object.c: (gst_v4l2_object_get_property_helper): + If "device-name" is requested and the device is not + open, try to temporarily open it to obtain this + information (#342494). + +2006-07-19 Tim-Philipp Müller <tim at centricular dot net> + * gst/nsf/nsf.c: (nsf_load): Really fix compilation. Apparently it's not enough to just check the return value for errors, but we need to diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c index 24120dd0..148ca399 100644 --- a/sys/v4l2/gstv4l2object.c +++ b/sys/v4l2/gstv4l2object.c @@ -406,8 +406,12 @@ gst_v4l2_object_get_property_helper (GstV4l2Object * v4l2object, { gchar *new = NULL; - if (GST_V4L2_IS_OPEN (v4l2object)) + if (GST_V4L2_IS_OPEN (v4l2object)) { + new = (gchar *) v4l2object->vcap.card; + } else if (gst_v4l2_open (v4l2object)) { new = (gchar *) v4l2object->vcap.card; + gst_v4l2_close (v4l2object); + } g_value_set_string (value, new); break; } |