46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
--- linux-libc-headers-2.6.15.99/include/linux/videodev2.h.orig 2006-03-20 11:14:35.000000000 +0100
|
|
+++ linux-libc-headers-2.6.15.99/include/linux/videodev2.h 2006-03-20 11:14:37.000000000 +0100
|
|
@@ -15,7 +15,32 @@
|
|
*/
|
|
#include <sys/time.h> /* need struct timeval */
|
|
#include <asm/types.h> /* needed __u64 */
|
|
-
|
|
+
|
|
+#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.15 */
|
|
+#define HAVE_V4L2 1
|
|
+
|
|
+/*
|
|
+ * Common stuff for both V4L1 and V4L2
|
|
+ * Moved from videodev.h
|
|
+ */
|
|
+
|
|
+#define VIDEO_MAX_FRAME 32
|
|
+
|
|
+#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 */
|
|
+
|
|
/*
|
|
* M I S C E L L A N E O U S
|
|
*/
|
|
@@ -464,7 +489,7 @@
|
|
struct v4l2_clip
|
|
{
|
|
struct v4l2_rect c;
|
|
- struct v4l2_clip __user *next;
|
|
+ struct v4l2_clip *next;
|
|
};
|
|
|
|
struct v4l2_window
|