summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2013-04-20 17:07:16 +0200
committerMauro Carvalho Chehab2013-04-25 15:29:14 +0200
commit4ed7e7bae6a4edc90bfa82b55716e4000b584436 (patch)
tree6599d5f1131da8424bdc0f70e16f642e264d6aa0
parentMerge branch 'topic/cx25821' into patchwork (diff)
downloadkernel-qcow2-linux-4ed7e7bae6a4edc90bfa82b55716e4000b584436.tar.gz
kernel-qcow2-linux-4ed7e7bae6a4edc90bfa82b55716e4000b584436.tar.xz
kernel-qcow2-linux-4ed7e7bae6a4edc90bfa82b55716e4000b584436.zip
[media] videodev2.h: Remove the unused old V4L1 buffer types
Those aren't used anywhere for a long time. Drop it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--include/uapi/linux/videodev2.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 97fb392bb2d9..f40b41c7e108 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -72,27 +72,6 @@
#define VIDEO_MAX_FRAME 32
#define VIDEO_MAX_PLANES 8
-#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 */
-#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 */
-#endif
-
/*
* M I S C E L L A N E O U S
*/