summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/gstv4l2object.c
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2006-05-18 19:34:47 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2006-05-18 19:34:47 +0000
commit34315d2c4b41273cb71ba8cbe6581dde40170ff0 (patch)
tree66dc753fa04a91603fed93c3f13c12b610f59120 /sys/v4l2/gstv4l2object.c
parentc946b4fe6f595cdd2cec4bc4e00c2682420801ad (diff)
configure.ac: Check for X11
Original commit message from CVS: * configure.ac: Check for X11 * sys/v4l2/gstv4l2object.c: (gst_v4l2_class_probe_devices): * sys/v4l2/gstv4l2object.h: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_iface_supported): * sys/v4l2/gstv4l2src.h: * sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open): * sys/v4l2/gstv4l2xoverlay.h: Code cleanups, fix debug macros
Diffstat (limited to 'sys/v4l2/gstv4l2object.c')
-rw-r--r--sys/v4l2/gstv4l2object.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index 941f9a6a..e7485ebf 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -33,7 +33,13 @@
#endif
#include "gstv4l2colorbalance.h"
-OPEN_V4L2OBJECT_PROPS CLOSE_V4L2OBJECT_PROPS const GList *
+enum
+{
+ PROP_0,
+ V4L2_STD_OBJECT_PROPS,
+};
+
+const GList *
gst_v4l2_probe_get_properties (GstPropertyProbe * probe)
{
GObjectClass *klass = G_OBJECT_GET_CLASS (probe);
@@ -60,7 +66,7 @@ gst_v4l2_class_probe_devices (GstElementClass * klass, gboolean check,
static GList *devices = NULL;
if (!init && !check) {
- gchar *dev_base[] = { "/dev/video", "/dev/v4l2/video", NULL };
+ const gchar *dev_base[] = { "/dev/video", "/dev/v4l2/video", NULL };
gint base, n, fd;
while (devices) {