diff options
-rw-r--r-- | Documentation/DocBook/v4l/videodev2.h.xml | 2 | ||||
-rw-r--r-- | include/linux/videodev2.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml index 7162b9ffc2b3..228277bf9f10 100644 --- a/Documentation/DocBook/v4l/videodev2.h.xml +++ b/Documentation/DocBook/v4l/videodev2.h.xml | |||
@@ -566,6 +566,7 @@ struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link> { | |||
566 | #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 | 566 | #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 |
567 | #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 | 567 | #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 |
568 | #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 | 568 | #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 |
569 | #define V4L2_FBUF_CAP_SRC_CHROMAKEY 0x0080 | ||
569 | /* Flags for the 'flags' field. */ | 570 | /* Flags for the 'flags' field. */ |
570 | #define V4L2_FBUF_FLAG_PRIMARY 0x0001 | 571 | #define V4L2_FBUF_FLAG_PRIMARY 0x0001 |
571 | #define V4L2_FBUF_FLAG_OVERLAY 0x0002 | 572 | #define V4L2_FBUF_FLAG_OVERLAY 0x0002 |
@@ -573,6 +574,7 @@ struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link> { | |||
573 | #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 | 574 | #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 |
574 | #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 | 575 | #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 |
575 | #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 | 576 | #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 |
577 | #define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 | ||
576 | 578 | ||
577 | struct <link linkend="v4l2-clip">v4l2_clip</link> { | 579 | struct <link linkend="v4l2-clip">v4l2_clip</link> { |
578 | struct <link linkend="v4l2-rect">v4l2_rect</link> c; | 580 | struct <link linkend="v4l2-rect">v4l2_rect</link> c; |
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 54395460a414..e4eb403a3b00 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -564,6 +564,7 @@ struct v4l2_framebuffer { | |||
564 | #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 | 564 | #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 |
565 | #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 | 565 | #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 |
566 | #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 | 566 | #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 |
567 | #define V4L2_FBUF_CAP_SRC_CHROMAKEY 0x0080 | ||
567 | /* Flags for the 'flags' field. */ | 568 | /* Flags for the 'flags' field. */ |
568 | #define V4L2_FBUF_FLAG_PRIMARY 0x0001 | 569 | #define V4L2_FBUF_FLAG_PRIMARY 0x0001 |
569 | #define V4L2_FBUF_FLAG_OVERLAY 0x0002 | 570 | #define V4L2_FBUF_FLAG_OVERLAY 0x0002 |
@@ -571,6 +572,7 @@ struct v4l2_framebuffer { | |||
571 | #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 | 572 | #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 |
572 | #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 | 573 | #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 |
573 | #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 | 574 | #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 |
575 | #define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040 | ||
574 | 576 | ||
575 | struct v4l2_clip { | 577 | struct v4l2_clip { |
576 | struct v4l2_rect c; | 578 | struct v4l2_rect c; |