diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-03 15:43:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-03 15:43:03 -0300 |
| commit | 4ff0e90195667bad0ed6a181d045fb8d71f7d053 (patch) | |
| tree | 5cb0f31550a142777ccefadc497e0b0e3f35eba5 /linux/include | |
| parent | a7e568a2750e0a41e50c08c29c55128ea3a8c9f7 (diff) | |
| parent | 47b097d6b7e8a03793616b4c05c0e211f76a8acc (diff) | |
| download | mediapointer-dvb-s2-4ff0e90195667bad0ed6a181d045fb8d71f7d053.tar.gz mediapointer-dvb-s2-4ff0e90195667bad0ed6a181d045fb8d71f7d053.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/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 { |