diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-12-06 09:52:26 +0100 |
|---|---|---|
| committer | Hans Verkuil <hans.verkuil@cisco.com> | 2014-12-06 09:52:26 +0100 |
| commit | cda56b961b7e3fbfb90f190e36c1b23d524aa013 (patch) | |
| tree | 28f44ac38110e2c161ac0886086c50b1af41acb4 | |
| parent | c470c46413330134aea089e8121744ad8fa792d7 (diff) | |
v4l-utils: sync-with-kernel
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
| -rw-r--r-- | contrib/freebsd/include/linux/v4l2-common.h | 2 | ||||
| -rw-r--r-- | contrib/freebsd/include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | include/linux/v4l2-common.h | 2 | ||||
| -rw-r--r-- | include/linux/videodev2.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/contrib/freebsd/include/linux/v4l2-common.h b/contrib/freebsd/include/linux/v4l2-common.h index 0b663bab..da64e221 100644 --- a/contrib/freebsd/include/linux/v4l2-common.h +++ b/contrib/freebsd/include/linux/v4l2-common.h @@ -43,6 +43,8 @@ #define V4L2_SEL_TGT_CROP_DEFAULT 0x0001 /* Cropping bounds */ #define V4L2_SEL_TGT_CROP_BOUNDS 0x0002 +/* Native frame size */ +#define V4L2_SEL_TGT_NATIVE_SIZE 0x0003 /* Current composing area */ #define V4L2_SEL_TGT_COMPOSE 0x0100 /* Default composing area */ diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 6cf899f8..ff438468 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -1356,6 +1356,7 @@ struct v4l2_input { #define V4L2_IN_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ #define V4L2_IN_CAP_CUSTOM_TIMINGS V4L2_IN_CAP_DV_TIMINGS /* For compatibility */ #define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ +#define V4L2_IN_CAP_NATIVE_SIZE 0x00000008 /* Supports setting native size */ /* * V I D E O O U T P U T S @@ -1379,6 +1380,7 @@ struct v4l2_output { #define V4L2_OUT_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ #define V4L2_OUT_CAP_CUSTOM_TIMINGS V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */ #define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ +#define V4L2_OUT_CAP_NATIVE_SIZE 0x00000008 /* Supports setting native size */ /* * C O N T R O L S diff --git a/include/linux/v4l2-common.h b/include/linux/v4l2-common.h index 2f6f8caf..15273987 100644 --- a/include/linux/v4l2-common.h +++ b/include/linux/v4l2-common.h @@ -43,6 +43,8 @@ #define V4L2_SEL_TGT_CROP_DEFAULT 0x0001 /* Cropping bounds */ #define V4L2_SEL_TGT_CROP_BOUNDS 0x0002 +/* Native frame size */ +#define V4L2_SEL_TGT_NATIVE_SIZE 0x0003 /* Current composing area */ #define V4L2_SEL_TGT_COMPOSE 0x0100 /* Default composing area */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 76f3a1b1..d32a2d8c 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -1322,6 +1322,7 @@ struct v4l2_input { #define V4L2_IN_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ #define V4L2_IN_CAP_CUSTOM_TIMINGS V4L2_IN_CAP_DV_TIMINGS /* For compatibility */ #define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ +#define V4L2_IN_CAP_NATIVE_SIZE 0x00000008 /* Supports setting native size */ /* * V I D E O O U T P U T S @@ -1345,6 +1346,7 @@ struct v4l2_output { #define V4L2_OUT_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ #define V4L2_OUT_CAP_CUSTOM_TIMINGS V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */ #define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ +#define V4L2_OUT_CAP_NATIVE_SIZE 0x00000008 /* Supports setting native size */ /* * C O N T R O L S |