From e04492bcb582be01ba5a5fe0201ba13974106d76 Mon Sep 17 00:00:00 2001 From: Sergio Aguirre Date: Tue, 20 Jan 2009 18:34:43 -0300 Subject: [PATCH] --- yaml --- r: 137905 b: refs/heads/master c: 2c32cc0c1f54d62c7e9ab81d1c1a3aa5b9efd73d h: refs/heads/master i: 137903: 6d9d22adfd8ac016650559dd4e93a9279d85d33f v: v3 --- [refs] | 2 +- trunk/include/linux/videodev2.h | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 797f2b1fd572..75535dcdd624 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 314893605e07547c372ebc6187e28c784ce0b1ed +refs/heads/master: 2c32cc0c1f54d62c7e9ab81d1c1a3aa5b9efd73d diff --git a/trunk/include/linux/videodev2.h b/trunk/include/linux/videodev2.h index 74aea975b305..c64e76a087b4 100644 --- a/trunk/include/linux/videodev2.h +++ b/trunk/include/linux/videodev2.h @@ -880,8 +880,15 @@ enum v4l2_power_line_frequency { #define V4L2_CID_BACKLIGHT_COMPENSATION (V4L2_CID_BASE+28) #define V4L2_CID_CHROMA_AGC (V4L2_CID_BASE+29) #define V4L2_CID_COLOR_KILLER (V4L2_CID_BASE+30) +#define V4L2_CID_COLORFX (V4L2_CID_BASE+31) +enum v4l2_colorfx { + V4L2_COLORFX_NONE = 0, + V4L2_COLORFX_BW = 1, + V4L2_COLORFX_SEPIA = 2, +}; + /* last CID + 1 */ -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+31) +#define V4L2_CID_LASTP1 (V4L2_CID_BASE+32) /* MPEG-class control IDs defined by V4L2 */ #define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)