diff options
author | Ricardo Ribalda Delgado <ribalda@kernel.org> | 2019-11-04 14:09:18 +0100 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2019-11-08 07:40:18 +0100 |
commit | 3b98a21a3202aeb9a47c0b57cab3d3ed420c1e05 (patch) | |
tree | fdf812a4d2bcb9eb27749da529892ea5a05da574 /include/media/v4l2-ctrls.h | |
parent | media: exynos4-is: fix wrong mdev and v4l2 dev order in error path (diff) | |
download | linux-3b98a21a3202aeb9a47c0b57cab3d3ed420c1e05.tar.xz linux-3b98a21a3202aeb9a47c0b57cab3d3ed420c1e05.zip |
media: v4l2_ctrl: Add p_def to v4l2_ctrl_config
This allows setting the default value on compound controls created via
v4l2_ctrl_new_custom.
Signed-off-by: Ricardo Ribalda Delgado <ribalda@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'include/media/v4l2-ctrls.h')
-rw-r--r-- | include/media/v4l2-ctrls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index e719d56fc024..78a97b10c89e 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -382,6 +382,7 @@ struct v4l2_ctrl_handler { * @max: The control's maximum value. * @step: The control's step value for non-menu controls. * @def: The control's default value. + * @p_def: The control's default value for compound controls. * @dims: The size of each dimension. * @elem_size: The size in bytes of the control. * @flags: The control's flags. @@ -410,6 +411,7 @@ struct v4l2_ctrl_config { s64 max; u64 step; s64 def; + union v4l2_ctrl_ptr p_def; u32 dims[V4L2_CTRL_MAX_DIMS]; u32 elem_size; u32 flags; |