From b17d6d60335e08ad0f24e3788b669a9f27ed32ce Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 20 Apr 2013 12:07:16 -0300 Subject: [PATCH] --- yaml --- r: 367187 b: refs/heads/master c: 4ed7e7bae6a4edc90bfa82b55716e4000b584436 h: refs/heads/master i: 367185: 389a968c63511d34892d597961bb966bc6275637 367183: 300f7a810efae47fd1067c6f10beb5066136afff v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/videodev2.h | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 1acba5255513..845031c53aaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5d0568e2a686684ecdd1d6cb4edc48bceace249 +refs/heads/master: 4ed7e7bae6a4edc90bfa82b55716e4000b584436 diff --git a/trunk/include/uapi/linux/videodev2.h b/trunk/include/uapi/linux/videodev2.h index 97fb392bb2d9..f40b41c7e108 100644 --- a/trunk/include/uapi/linux/videodev2.h +++ b/trunk/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 */