From da5e462697bb00b35274546f40825fb1afe530cd Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 26 Jul 2008 08:33:47 -0300
Subject: [PATCH] --- yaml --- r: 106767 b: refs/heads/master c:
 c1d7f4f1648cb8efd87f1b9560c40af2297e7c05 h: refs/heads/master i:   106765:
 df49f78e8e3c9d3ec2fcb5bbfd3ee8bb8aaf2ac0   106763:
 fcff52bbe75b44dec9fb2d9beb27eccd1e7d9caa   106759:
 74782b1eaa3188f34ed38a6d8fa6d89b34bd1716   106751:
 2f25138e82065bbda097dce1b7913e5eb5d55d14 v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/videodev.h  | 15 +++++++++++++++
 trunk/include/linux/videodev2.h |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 83a48f88e840..b636cef8a4e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ea6bc8d43c9ee3c5384bea184eab020927a5b2c
+refs/heads/master: c1d7f4f1648cb8efd87f1b9560c40af2297e7c05
diff --git a/trunk/include/linux/videodev.h b/trunk/include/linux/videodev.h
index 9385a566aed8..15a653d41132 100644
--- a/trunk/include/linux/videodev.h
+++ b/trunk/include/linux/videodev.h
@@ -17,6 +17,21 @@
 
 #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
 
+#define VID_TYPE_CAPTURE	1	/* Can capture */
+#define VID_TYPE_TUNER		2	/* Can tune */
+#define VID_TYPE_TELETEXT	4	/* Does teletext */
+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
+#define VID_TYPE_CLIPPING	32	/* Can clip */
+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
+#define VID_TYPE_SCALES		128	/* Scalable */
+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
+
 struct video_capability
 {
 	char name[32];
diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h
index 7d9ac046389e..f7195351a1e7 100644
--- a/trunk/include/linux/videodev2.h
+++ b/trunk/include/linux/videodev2.h
@@ -71,6 +71,11 @@
  */
 #define VIDEO_MAX_FRAME               32
 
+#ifndef __KERNEL__
+
+/* These defines are V4L1 specific and should not be used with the V4L2 API!
+   They will be removed from this header in the future. */
+
 #define VID_TYPE_CAPTURE	1	/* Can capture */
 #define VID_TYPE_TUNER		2	/* Can tune */
 #define VID_TYPE_TELETEXT	4	/* Does teletext */
@@ -85,6 +90,7 @@
 #define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
 #define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
 #define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
+#endif
 
 /*
  *	M I S C E L L A N E O U S