diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-03 18:42:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-03 18:42:33 -0300 |
| commit | 2c888a66d88e5aefc1bdb302c7cd7323b63e389f (patch) | |
| tree | 75348f946cc95400e870fbd29d38d6311fe32359 /linux/include | |
| parent | 33c78c13eddb4c4a04755bd86526fc21536a3c8b (diff) | |
| parent | 4ff0e90195667bad0ed6a181d045fb8d71f7d053 (diff) | |
| download | mediapointer-dvb-s2-2c888a66d88e5aefc1bdb302c7cd7323b63e389f.tar.gz mediapointer-dvb-s2-2c888a66d88e5aefc1bdb302c7cd7323b63e389f.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index f21fc9c3b..a90abcc7e 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -617,7 +617,6 @@ struct v4l2_framebuffer #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 -#define V4L2_FBUF_CAP_GLOBAL_INV_ALPHA 0x0080 /* Flags for the 'flags' field. */ #define V4L2_FBUF_FLAG_PRIMARY 0x0001 #define V4L2_FBUF_FLAG_OVERLAY 0x0002 @@ -625,7 +624,6 @@ struct v4l2_framebuffer #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 -#define V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA 0x0040 struct v4l2_clip { |