merge: http://linuxtv.org/hg/~dougsland/em28xx/

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

64 files changed, 62 insertions, 36 deletions

diff --git a/.hgignore b/.hgignore
index 074582599..cc9eea282 100644
--- a/.hgignore
+++ b/.hgignore
@@ -27,7 +27,7 @@ v4l/modules.order$
 v4l/config-compat.h$
 v4l/.myconfig$
 v4l/.snapshot$
-v4l2-apps/lib/.*\.so$
+v4l2-apps/libv4l2util/.*\.so$
 v4l2-apps/include
 v4l2-apps/test/driver-test$
 v4l2-apps/test/v4lgrab$
@@ -35,11 +35,13 @@ v4l2-apps/test/ioctl-test$
 v4l2-apps/test/sliced-vbi-detect$
 v4l2-apps/test/sliced-vbi-test$
 v4l2-apps/test/vbi-test$
-v4l2-apps/test/capture_example$
+v4l2-apps/test/capture-example$
 v4l2-apps/test/pixfmt-test$
+v4l2-apps/test/stress-buffer$
 v4l2-apps/util/v4l2-dbg$
 v4l2-apps/util/v4l2-chipids.cpp$
 v4l2-apps/util/v4l2-compliance$
+v4l2-apps/util/v4l2-sysfs-path$
 v4l2-apps/util/keycodes/.*
 v4l2-apps/util/keytable$
 v4l2-apps/util/parse.h$
@@ -52,8 +54,10 @@ v4l2-apps/util/v4l2-ctl$
 v4l2-apps/util/cx18-ctl$
 v4l2-apps/util/ivtv-ctl$
 v4l2-apps/util/v4l-board-dbg$
-v4l2-apps/lib/libv4l/libv4l[12]/.*.so.0$
-v4l2-apps/lib/libv4l/libv4lconvert/.*.so.0$
+v4l2-apps/libv4l/libv4l[12]/.*.so.0$
+v4l2-apps/libv4l/libv4lconvert/.*.so.0$
+v4l2-apps/libv4l/libv4l[12]/.*.so$
+v4l2-apps/libv4l/libv4lconvert/.*.so$
 v4l2-spec/capture$
 v4l2-spec/capture.c.sgml$
 v4l2-spec/entities.sgml$
diff --git a/hgimport b/hgimport
index 099acbc52..a8f46554d 100755
--- a/hgimport
+++ b/hgimport
@@ -104,3 +104,5 @@ done
 
 echo To cherry pick all files, you can do something like:
 echo "for i in $TMP/*.patch; do ./mailimport \$i; done"
+echo "To merge it, the better is to do:"
+echo "hg pull $1 && hg merge && hg commit && make && hg push"
diff --git a/linux/drivers/media/video/cx18/cx18-controls.c b/linux/drivers/media/video/cx18/cx18-controls.c
index 6af4d5c19..10a4e07b7 100644
--- a/linux/drivers/media/video/cx18/cx18-controls.c
+++ b/linux/drivers/media/video/cx18/cx18-controls.c
@@ -30,6 +30,7 @@
 #include "cx18-mailbox.h"
 #include "cx18-controls.h"
 
+/* Must be sorted from low to high control ID! */
 static const u32 user_ctrls[] = {
 	V4L2_CID_USER_CLASS,
 	V4L2_CID_BRIGHTNESS,
diff --git a/linux/drivers/media/video/cx2341x.c b/linux/drivers/media/video/cx2341x.c
index ebee97bc2..01c4d2d02 100644
--- a/linux/drivers/media/video/cx2341x.c
+++ b/linux/drivers/media/video/cx2341x.c
@@ -39,6 +39,7 @@ static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
+/* Must be sorted from low to high control ID! */
 const u32 cx2341x_mpeg_ctrls[] = {
 	V4L2_CID_MPEG_CLASS,
 	V4L2_CID_MPEG_STREAM_TYPE,
diff --git a/linux/drivers/media/video/cx23885/cx23885-video.c b/linux/drivers/media/video/cx23885/cx23885-video.c
index 09291888d..131fc740a 100644
--- a/linux/drivers/media/video/cx23885/cx23885-video.c
+++ b/linux/drivers/media/video/cx23885/cx23885-video.c
@@ -276,6 +276,7 @@ static struct cx23885_ctrl cx23885_ctls[] = {
 };
 static const int CX23885_CTLS = ARRAY_SIZE(cx23885_ctls);
 
+/* Must be sorted from low to high control ID! */
 static const u32 cx23885_user_ctrls[] = {
 	V4L2_CID_USER_CLASS,
 	V4L2_CID_BRIGHTNESS,
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index a95bcb0ea..c8870cf06 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -299,6 +299,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
 };
 static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
 
+/* Must be sorted from low to high control ID! */
 const u32 cx88_user_ctrls[] = {
 	V4L2_CID_USER_CLASS,
 	V4L2_CID_BRIGHTNESS,
diff --git a/linux/drivers/media/video/ivtv/ivtv-controls.c b/linux/drivers/media/video/ivtv/ivtv-controls.c
index 62aa06f5d..84995bcf4 100644
--- a/linux/drivers/media/video/ivtv/ivtv-controls.c
+++ b/linux/drivers/media/video/ivtv/ivtv-controls.c
@@ -26,6 +26,7 @@
 #include "ivtv-mailbox.h"
 #include "ivtv-controls.h"
 
+/* Must be sorted from low to high control ID! */
 static const u32 user_ctrls[] = {
 	V4L2_CID_USER_CLASS,
 	V4L2_CID_BRIGHTNESS,
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c
index 3b0b42545..813f5f88d 100644
--- a/linux/drivers/media/video/saa7134/saa7134-empress.c
+++ b/linux/drivers/media/video/saa7134/saa7134-empress.c
@@ -352,6 +352,7 @@ static int empress_s_ctrl(struct file *file, void *priv,
 static int empress_queryctrl(struct file *file, void *priv,
 					struct v4l2_queryctrl *c)
 {
+	/* Must be sorted from low to high control ID! */
 	static const u32 user_ctrls[] = {
 		V4L2_CID_USER_CLASS,
 		V4L2_CID_BRIGHTNESS,
@@ -364,6 +365,7 @@ static int empress_queryctrl(struct file *file, void *priv,
 		0
 	};
 
+	/* Must be sorted from low to high control ID! */
 	static const u32 mpeg_ctrls[] = {
 		V4L2_CID_MPEG_CLASS,
 		V4L2_CID_MPEG_STREAM_TYPE,
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 6cc7d4058..8ae8dd366 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -750,7 +750,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);
 /* ctrl_classes points to an array of u32 pointers, the last element is
    a NULL pointer. Each u32 array is a 0-terminated array of control IDs.
    Each array must be sorted low to high and belong to the same control
-   class. The array of u32 pointer must also be sorted, from low class IDs
+   class. The array of u32 pointers must also be sorted, from low class IDs
    to high class IDs.
 
    This function returns the first ID that follows after the given ID.
diff --git a/linux/drivers/media/video/v4l2-subdev.c b/linux/drivers/media/video/v4l2-subdev.c
index 158bc55de..923ec8d01 100644
--- a/linux/drivers/media/video/v4l2-subdev.c
+++ b/linux/drivers/media/video/v4l2-subdev.c
@@ -104,6 +104,10 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
 		return v4l2_subdev_call(sd, video, g_fmt, arg);
 	case VIDIOC_INT_S_STD_OUTPUT:
 		return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id *)arg);
+	case VIDIOC_QUERYSTD:
+		return v4l2_subdev_call(sd, video, querystd, arg);
+	case VIDIOC_INT_G_INPUT_STATUS:
+		return v4l2_subdev_call(sd, video, g_input_status, arg);
 	case VIDIOC_STREAMON:
 		return v4l2_subdev_call(sd, video, s_stream, 1);
 	case VIDIOC_STREAMOFF:
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h
index 0f864f8da..de785da45 100644
--- a/linux/include/media/v4l2-common.h
+++ b/linux/include/media/v4l2-common.h
@@ -107,6 +107,11 @@ int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu,
 		struct v4l2_queryctrl *qctrl, const char **menu_items);
 #define V4L2_CTRL_MENU_IDS_END (0xffffffff)
 int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids);
+
+/* Note: ctrl_classes points to an array of u32 pointers. Each u32 array is a
+   0-terminated array of control IDs. Each array must be sorted low to high
+   and belong to the same control class. The array of u32 pointers must also
+   be sorted, from low class IDs to high class IDs. */
 u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);
 
 /* ------------------------------------------------------------------------- */
@@ -297,4 +302,7 @@ struct v4l2_crystal_freq {
    a v4l2_gpio struct if a direction is also needed. */
 #define VIDIOC_INT_S_GPIO		_IOW('d', 117, u32)
 
+/* Get input status. Same as the status field in the v4l2_input struct. */
+#define VIDIOC_INT_G_INPUT_STATUS	_IOR('d', 118, u32)
+
 #endif /* V4L2_COMMON_H_ */
diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h
index 9c1663d91..cd640c6f0 100644
--- a/linux/include/media/v4l2-subdev.h
+++ b/linux/include/media/v4l2-subdev.h
@@ -115,6 +115,8 @@ struct v4l2_subdev_video_ops {
 	int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
 	int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
 	int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
+	int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
+	int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
 	int (*s_stream)(struct v4l2_subdev *sd, int enable);
 	int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
 	int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
diff --git a/v4l2-apps/Makefile b/v4l2-apps/Makefile
index 2bba8fcd4..86b5bc267 100644
--- a/v4l2-apps/Makefile
+++ b/v4l2-apps/Makefile
@@ -5,7 +5,8 @@
 all:: prepare-includes
 
 all clean install::
-	$(MAKE) -C lib $@
+	$(MAKE) -C libv4l $@
+	$(MAKE) -C libv4l2util $@
 	$(MAKE) -C util $@
 	$(MAKE) -C test $@
 
diff --git a/v4l2-apps/lib/COPYING.LIB b/v4l2-apps/libv4l/COPYING.LIB
index 1dd325d2b..1dd325d2b 100644
--- a/v4l2-apps/lib/COPYING.LIB
+++ b/v4l2-apps/libv4l/COPYING.LIB
diff --git a/v4l2-apps/lib/libv4l/ChangeLog b/v4l2-apps/libv4l/ChangeLog
index dd53eced9..dd53eced9 100644
--- a/v4l2-apps/lib/libv4l/ChangeLog
+++ b/v4l2-apps/libv4l/ChangeLog
diff --git a/v4l2-apps/lib/libv4l/Makefile b/v4l2-apps/libv4l/Makefile
index 4c99c3167..4c99c3167 100644
--- a/v4l2-apps/lib/libv4l/Makefile
+++ b/v4l2-apps/libv4l/Makefile
diff --git a/v4l2-apps/lib/libv4l/README b/v4l2-apps/libv4l/README
index 3a2059224..3a2059224 100644
--- a/v4l2-apps/lib/libv4l/README
+++ b/v4l2-apps/libv4l/README
diff --git a/v4l2-apps/lib/libv4l/README.multi-threading b/v4l2-apps/libv4l/README.multi-threading
index 93b393c8c..93b393c8c 100644
--- a/v4l2-apps/lib/libv4l/README.multi-threading
+++ b/v4l2-apps/libv4l/README.multi-threading
diff --git a/v4l2-apps/lib/libv4l/TODO b/v4l2-apps/libv4l/TODO
index f3f9ff527..f3f9ff527 100644
--- a/v4l2-apps/lib/libv4l/TODO
+++ b/v4l2-apps/libv4l/TODO
diff --git a/v4l2-apps/lib/libv4l/include/libv4l1.h b/v4l2-apps/libv4l/include/libv4l1.h
index c878cc198..c878cc198 100644
--- a/v4l2-apps/lib/libv4l/include/libv4l1.h
+++ b/v4l2-apps/libv4l/include/libv4l1.h
diff --git a/v4l2-apps/lib/libv4l/include/libv4l2.h b/v4l2-apps/libv4l/include/libv4l2.h
index b05b57cb6..b05b57cb6 100644
--- a/v4l2-apps/lib/libv4l/include/libv4l2.h
+++ b/v4l2-apps/libv4l/include/libv4l2.h
diff --git a/v4l2-apps/lib/libv4l/include/libv4lconvert.h b/v4l2-apps/libv4l/include/libv4lconvert.h
index 626c43473..626c43473 100644
--- a/v4l2-apps/lib/libv4l/include/libv4lconvert.h
+++ b/v4l2-apps/libv4l/include/libv4lconvert.h
diff --git a/v4l2-apps/lib/libv4l/libv4l1/Makefile b/v4l2-apps/libv4l/libv4l1/Makefile
index 27848477e..27848477e 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/Makefile
+++ b/v4l2-apps/libv4l/libv4l1/Makefile
diff --git a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h b/v4l2-apps/libv4l/libv4l1/libv4l1-priv.h
index 651599255..651599255 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h
+++ b/v4l2-apps/libv4l/libv4l1/libv4l1-priv.h
diff --git a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c b/v4l2-apps/libv4l/libv4l1/libv4l1.c
index 797c8768a..797c8768a 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c
+++ b/v4l2-apps/libv4l/libv4l1/libv4l1.c
diff --git a/v4l2-apps/lib/libv4l/libv4l1/log.c b/v4l2-apps/libv4l/libv4l1/log.c
index 9ff0cea46..9ff0cea46 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/log.c
+++ b/v4l2-apps/libv4l/libv4l1/log.c
diff --git a/v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c b/v4l2-apps/libv4l/libv4l1/v4l1compat.c
index e4293d2f9..e4293d2f9 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c
+++ b/v4l2-apps/libv4l/libv4l1/v4l1compat.c
diff --git a/v4l2-apps/lib/libv4l/libv4l2/Makefile b/v4l2-apps/libv4l/libv4l2/Makefile
index 648d27c0c..648d27c0c 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/Makefile
+++ b/v4l2-apps/libv4l/libv4l2/Makefile
diff --git a/v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h b/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h
index 8724832e1..8724832e1 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h
+++ b/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h
diff --git a/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c b/v4l2-apps/libv4l/libv4l2/libv4l2.c
index b4a10afac..b4a10afac 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c
+++ b/v4l2-apps/libv4l/libv4l2/libv4l2.c
diff --git a/v4l2-apps/lib/libv4l/libv4l2/log.c b/v4l2-apps/libv4l/libv4l2/log.c
index 6237d55ec..6237d55ec 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/log.c
+++ b/v4l2-apps/libv4l/libv4l2/log.c
diff --git a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c b/v4l2-apps/libv4l/libv4l2/v4l2convert.c
index 307a03ce5..307a03ce5 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c
+++ b/v4l2-apps/libv4l/libv4l2/v4l2convert.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile b/v4l2-apps/libv4l/libv4lconvert/Makefile
index 641d19d6e..641d19d6e 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile
+++ b/v4l2-apps/libv4l/libv4lconvert/Makefile
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/bayer.c b/v4l2-apps/libv4l/libv4lconvert/bayer.c
index ca7bb486f..ca7bb486f 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/bayer.c
+++ b/v4l2-apps/libv4l/libv4lconvert/bayer.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/flip.c b/v4l2-apps/libv4l/libv4lconvert/flip.c
index cd3468a89..cd3468a89 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/flip.c
+++ b/v4l2-apps/libv4l/libv4lconvert/flip.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c b/v4l2-apps/libv4l/libv4lconvert/jidctflt.c
index 532abc7ea..532abc7ea 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c
+++ b/v4l2-apps/libv4l/libv4lconvert/jidctflt.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h
index 0c4eff6ce..0c4eff6ce 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h
+++ b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c
index 93bc67c7e..93bc67c7e 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c
+++ b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/pac207.c b/v4l2-apps/libv4l/libv4lconvert/pac207.c
index 97ef4ebc0..97ef4ebc0 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/pac207.c
+++ b/v4l2-apps/libv4l/libv4lconvert/pac207.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/rgbyuv.c b/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c
index 0f26b227a..0f26b227a 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/rgbyuv.c
+++ b/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c b/v4l2-apps/libv4l/libv4lconvert/sn9c10x.c
index 4ea526d49..4ea526d49 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c
+++ b/v4l2-apps/libv4l/libv4lconvert/sn9c10x.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/spca501.c b/v4l2-apps/libv4l/libv4lconvert/spca501.c
index 9157629e3..9157629e3 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/spca501.c
+++ b/v4l2-apps/libv4l/libv4lconvert/spca501.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c b/v4l2-apps/libv4l/libv4lconvert/spca561-decompress.c
index 01eed4ec5..01eed4ec5 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c
+++ b/v4l2-apps/libv4l/libv4lconvert/spca561-decompress.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg-internal.h b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg-internal.h
index 26844c28a..26844c28a 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg-internal.h
+++ b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg-internal.h
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.c b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.c
index fc9efbeb2..fc9efbeb2 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.c
+++ b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.c
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.h b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.h
index b0096f0de..b0096f0de 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.h
+++ b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.h
diff --git a/v4l2-apps/lib/libv4l/COPYING.LIB b/v4l2-apps/libv4l2util/COPYING.LIB
index 1dd325d2b..1dd325d2b 100644
--- a/v4l2-apps/lib/libv4l/COPYING.LIB
+++ b/v4l2-apps/libv4l2util/COPYING.LIB
diff --git a/v4l2-apps/lib/Makefile b/v4l2-apps/libv4l2util/Makefile
index 8443039b4..f3f413071 100644
--- a/v4l2-apps/lib/Makefile
+++ b/v4l2-apps/libv4l2util/Makefile
@@ -2,12 +2,12 @@
 
 CPPFLAGS += -I../include -I..
 
-includes = v4l2.h
+includes = libv4l2util.h
 
 objects  = frequencies.o v4l2_driver.o
 
-sharedlib = libv4l2.so
-staticlib = libv4l2.a
+sharedlib = libv4l2util.so
+staticlib = libv4l2util.a
 
 ifeq ($(prefix),)
 prefix = /usr
diff --git a/v4l2-apps/lib/TODO b/v4l2-apps/libv4l2util/TODO
index 456a916ce..456a916ce 100644
--- a/v4l2-apps/lib/TODO
+++ b/v4l2-apps/libv4l2util/TODO
diff --git a/v4l2-apps/lib/frequencies.c b/v4l2-apps/libv4l2util/frequencies.c
index 64379d2b0..df8d47dba 100644
--- a/v4l2-apps/lib/frequencies.c
+++ b/v4l2-apps/libv4l2util/frequencies.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include <linux/videodev2.h>
-#include "v4l2.h"
+#include "libv4l2util.h"
 
 /* This source was originally written by Nathan Laredo <laredo@gnu.org>.
    He kindly gave permission to release this source under the LGPL
diff --git a/v4l2-apps/lib/v4l2.h b/v4l2-apps/libv4l2util/libv4l2util.h
index 172688853..fde7cdc75 100644
--- a/v4l2-apps/lib/v4l2.h
+++ b/v4l2-apps/libv4l2util/libv4l2util.h
@@ -15,8 +15,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _V4L2_H_
-#define _V4L2_H_
+#ifndef _V4L2UTIL_H_
+#define _V4L2UTIL_H_
 
 /* --------------------------------------------------------------------- */
 
diff --git a/v4l2-apps/lib/v4l2_driver.c b/v4l2-apps/libv4l2util/v4l2_driver.c
index 94f826968..94f826968 100644
--- a/v4l2-apps/lib/v4l2_driver.c
+++ b/v4l2-apps/libv4l2util/v4l2_driver.c
diff --git a/v4l2-apps/lib/v4l2_driver.h b/v4l2-apps/libv4l2util/v4l2_driver.h
index b5d5dd22d..b5d5dd22d 100644
--- a/v4l2-apps/lib/v4l2_driver.h
+++ b/v4l2-apps/libv4l2util/v4l2_driver.h
diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile
index a996c0baf..d118b9210 100644
--- a/v4l2-apps/test/Makefile
+++ b/v4l2-apps/test/Makefile
@@ -10,7 +10,7 @@ binaries = ioctl-test 		\
 	   driver-test		\
 	   pixfmt-test		\
 	   stress-buffer	\
-	   capture_example
+	   capture-example
 
 .PHONY: all clean install
 
@@ -21,10 +21,10 @@ clean::
 
 install:
 
-../lib/libv4l2.a: ../lib/v4l2_driver.c ../lib/frequencies.c
-	make -C ../lib libv4l2.a
+../libv4l2util/libv4l2util.a: ../libv4l2util/v4l2_driver.c ../libv4l2util/frequencies.c
+	make -C ../libv4l2util libv4l2util.a
 
-driver-test: driver-test.o ../lib/libv4l2.a
+driver-test: driver-test.o ../libv4l2util/libv4l2util.a
 
 pixfmt-test: pixfmt-test.o
 	$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lX11
diff --git a/v4l2-apps/test/capture_example.c b/v4l2-apps/test/capture-example.c
index 0cd129885..9d5b0d6ce 100644
--- a/v4l2-apps/test/capture_example.c
+++ b/v4l2-apps/test/capture-example.c
@@ -23,17 +23,15 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 
-#include <asm/types.h>          /* for videodev2.h */
-
 #include <linux/videodev2.h>
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))
 
-typedef enum {
+enum io_method {
 	IO_METHOD_READ,
 	IO_METHOD_MMAP,
 	IO_METHOD_USERPTR,
-} io_method;
+};
 
 struct buffer {
 	void   *start;
@@ -41,7 +39,7 @@ struct buffer {
 };
 
 static char            *dev_name;
-static io_method        io = IO_METHOD_MMAP;
+static enum io_method   io = IO_METHOD_MMAP;
 static int              fd = -1;
 struct buffer          *buffers;
 static unsigned int     n_buffers;
@@ -570,7 +568,7 @@ static void usage(FILE *fp, int argc, char **argv)
 		 "-f | --format        Force format to 640x480 YUYV\n"
 		 "-c | --count         Number of frames to grab [%i]\n"
 		 "",
-		 argv[0],dev_name,frame_count );
+		 argv[0], dev_name, frame_count);
 }
 
 static const char short_options[] = "d:hmruofc:";
diff --git a/v4l2-apps/test/driver-test.c b/v4l2-apps/test/driver-test.c
index e4c16ed54..1f722e198 100644
--- a/v4l2-apps/test/driver-test.c
+++ b/v4l2-apps/test/driver-test.c
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
  */
 
-#include "../lib/v4l2_driver.h"
+#include "../libv4l2util/v4l2_driver.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/v4l2-apps/test/parse_sniffusb2.pl b/v4l2-apps/test/parse-sniffusb2.pl
index 34406b0ea..34406b0ea 100644
--- a/v4l2-apps/test/parse_sniffusb2.pl
+++ b/v4l2-apps/test/parse-sniffusb2.pl
diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile
index f2c4c0a38..6f9d1071a 100644
--- a/v4l2-apps/util/Makefile
+++ b/v4l2-apps/util/Makefile
@@ -7,7 +7,7 @@ endif
 CPPFLAGS += -I../include -D_GNU_SOURCE
 LDFLAGS += -lm
 
-binaries = v4l2-ctl v4l2-dbg v4l2-compliance ivtv-ctl cx18-ctl v4l2_sysfs_path
+binaries = v4l2-ctl v4l2-dbg v4l2-compliance ivtv-ctl cx18-ctl v4l2-sysfs-path
 
 ifeq ($(prefix),)
 prefix = /usr
@@ -34,13 +34,13 @@ v4l2-dbg: v4l2-dbg.o v4l2-chipids.o
 
 v4l2-dbg.o: v4l2-dbg.h v4l2-dbg-bttv.h v4l2-dbg-em28xx.h v4l2-dbg-saa7134.h
 
-v4l2_sysfs_path.o: v4l2_sysfs_path.c ../lib/v4l2_driver.h
+v4l2-sysfs-path.o: v4l2-sysfs-path.c ../libv4l2util/v4l2_driver.h
 
-v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2.a
+v4l2-sysfs-path: v4l2-sysfs-path.o ../libv4l2util/libv4l2util.a
 	$(CC) $^ -o $@ -lsysfs
 
-../lib/libv4l2.a:
-	$(MAKE) -C ../lib libv4l2.a
+../libv4l2util/libv4l2util.a:
+	$(MAKE) -C ../libv4l2util libv4l2util.a
 
 install:
 	mkdir -p $(prefix)/bin
diff --git a/v4l2-apps/util/qv4l2/ctrl-tab.cpp b/v4l2-apps/util/qv4l2/ctrl-tab.cpp
index c7d1a275c..6f436b494 100644
--- a/v4l2-apps/util/qv4l2/ctrl-tab.cpp
+++ b/v4l2-apps/util/qv4l2/ctrl-tab.cpp
@@ -1,6 +1,6 @@
 
 #include "qv4l2.h"
-#include "v4l2.h"
+#include "libv4l2util.h"
 
 #include <qstatusbar.h>
 #include <qlineedit.h>
diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp
index 3b9ad2e5b..78656cf10 100644
--- a/v4l2-apps/util/qv4l2/general-tab.cpp
+++ b/v4l2-apps/util/qv4l2/general-tab.cpp
@@ -20,7 +20,7 @@
 
 #include "qv4l2.h"
 #include "general-tab.h"
-#include "v4l2.h"
+#include "libv4l2util.h"
 
 #include <qlabel.h>
 #include <qspinbox.h>
diff --git a/v4l2-apps/util/qv4l2/qv4l2.cpp b/v4l2-apps/util/qv4l2/qv4l2.cpp
index d144723d9..764fbd172 100644
--- a/v4l2-apps/util/qv4l2/qv4l2.cpp
+++ b/v4l2-apps/util/qv4l2/qv4l2.cpp
@@ -1,7 +1,7 @@
 
 #include "qv4l2.h"
 #include "general-tab.h"
-#include "v4l2.h"
+#include "libv4l2util.h"
 
 #include <qimage.h>
 #include <qpixmap.h>
diff --git a/v4l2-apps/util/qv4l2/qv4l2.pro b/v4l2-apps/util/qv4l2/qv4l2.pro
index 5e0b7555d..96adb7260 100644
--- a/v4l2-apps/util/qv4l2/qv4l2.pro
+++ b/v4l2-apps/util/qv4l2/qv4l2.pro
@@ -3,10 +3,10 @@
 ######################################################################
 
 TEMPLATE = app
-INCLUDEPATH += . ../../include ../../lib
+INCLUDEPATH += . ../../include ../../libv4l2util
 CONFIG += debug
 
 # Input
 HEADERS += qv4l2.h general-tab.h
 SOURCES += qv4l2.cpp general-tab.cpp ctrl-tab.cpp
-LIBS += -lv4l2 -L../../lib
+LIBS += -lv4l2util -L../../libv4l2util
diff --git a/v4l2-apps/util/v4l2_sysfs_path.c b/v4l2-apps/util/v4l2-sysfs-path.c
index 2fe89b6c7..e3f3e63e8 100644
--- a/v4l2-apps/util/v4l2_sysfs_path.c
+++ b/v4l2-apps/util/v4l2-sysfs-path.c
@@ -16,7 +16,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include "../lib/v4l2_driver.h"
+#include "../libv4l2util/v4l2_driver.h"
 #include <sysfs/libsysfs.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/v4l2-spec/Makefile b/v4l2-spec/Makefile
index 9a13c9171..d0dde12f4 100644
--- a/v4l2-spec/Makefile
+++ b/v4l2-spec/Makefile
@@ -320,7 +320,7 @@ DOCUMENTED = \
 	-e "s/\(V4L2_PIX_FMT_[A-Z0-9_]\+\) /<link linkend=\"\1\">\1<\/link> /g" \
 	-e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta"
 
-capture.c.sgml: ../v4l2-apps/test/capture_example.c Makefile
+capture.c.sgml: ../v4l2-apps/test/capture-example.c Makefile
 	echo "<programlisting>" > $@
 	expand --tabs=8 < $< | \
 	  sed $(ESCAPE) $(DOCUMENTED) | \
@@ -478,7 +478,7 @@ pdf-build.stamp: Makefile checks $(SGMLS) $(PDFPICS)
 	touch pdf-build.stamp
 
 # Example.
-capture: ../v4l2-apps/test/capture_example.c
+capture: ../v4l2-apps/test/capture-example.c
 	gcc $^ -o $@
 
 distclean clean: