diff options
Diffstat (limited to 'include/media/v4l2-dev.h')
| -rw-r--r-- | include/media/v4l2-dev.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 1dd3d3239ecf..d62847f846c2 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
| @@ -127,6 +127,8 @@ struct video_device | |||
| 127 | struct v4l2_fmtdesc *f); | 127 | struct v4l2_fmtdesc *f); |
| 128 | int (*vidioc_enum_fmt_video_output)(struct file *file, void *fh, | 128 | int (*vidioc_enum_fmt_video_output)(struct file *file, void *fh, |
| 129 | struct v4l2_fmtdesc *f); | 129 | struct v4l2_fmtdesc *f); |
| 130 | int (*vidioc_enum_fmt_output_overlay) (struct file *file, void *fh, | ||
| 131 | struct v4l2_fmtdesc *f); | ||
| 130 | int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh, | 132 | int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh, |
| 131 | struct v4l2_fmtdesc *f); | 133 | struct v4l2_fmtdesc *f); |
| 132 | int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, | 134 | int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, |
| @@ -145,6 +147,8 @@ struct video_device | |||
| 145 | struct v4l2_format *f); | 147 | struct v4l2_format *f); |
| 146 | int (*vidioc_g_fmt_video_output)(struct file *file, void *fh, | 148 | int (*vidioc_g_fmt_video_output)(struct file *file, void *fh, |
| 147 | struct v4l2_format *f); | 149 | struct v4l2_format *f); |
| 150 | int (*vidioc_g_fmt_output_overlay) (struct file *file, void *fh, | ||
| 151 | struct v4l2_format *f); | ||
| 148 | int (*vidioc_g_fmt_type_private)(struct file *file, void *fh, | 152 | int (*vidioc_g_fmt_type_private)(struct file *file, void *fh, |
| 149 | struct v4l2_format *f); | 153 | struct v4l2_format *f); |
| 150 | 154 | ||
| @@ -162,6 +166,8 @@ struct video_device | |||
| 162 | struct v4l2_format *f); | 166 | struct v4l2_format *f); |
| 163 | int (*vidioc_s_fmt_video_output)(struct file *file, void *fh, | 167 | int (*vidioc_s_fmt_video_output)(struct file *file, void *fh, |
| 164 | struct v4l2_format *f); | 168 | struct v4l2_format *f); |
| 169 | int (*vidioc_s_fmt_output_overlay) (struct file *file, void *fh, | ||
| 170 | struct v4l2_format *f); | ||
| 165 | int (*vidioc_s_fmt_type_private)(struct file *file, void *fh, | 171 | int (*vidioc_s_fmt_type_private)(struct file *file, void *fh, |
| 166 | struct v4l2_format *f); | 172 | struct v4l2_format *f); |
| 167 | 173 | ||
| @@ -178,6 +184,8 @@ struct video_device | |||
| 178 | struct v4l2_format *f); | 184 | struct v4l2_format *f); |
| 179 | int (*vidioc_try_fmt_video_output)(struct file *file, void *fh, | 185 | int (*vidioc_try_fmt_video_output)(struct file *file, void *fh, |
| 180 | struct v4l2_format *f); | 186 | struct v4l2_format *f); |
| 187 | int (*vidioc_try_fmt_output_overlay)(struct file *file, void *fh, | ||
| 188 | struct v4l2_format *f); | ||
| 181 | int (*vidioc_try_fmt_type_private)(struct file *file, void *fh, | 189 | int (*vidioc_try_fmt_type_private)(struct file *file, void *fh, |
| 182 | struct v4l2_format *f); | 190 | struct v4l2_format *f); |
| 183 | 191 | ||
| @@ -309,6 +317,8 @@ struct video_device | |||
| 309 | int (*vidioc_s_register) (struct file *file, void *fh, | 317 | int (*vidioc_s_register) (struct file *file, void *fh, |
| 310 | struct v4l2_register *reg); | 318 | struct v4l2_register *reg); |
| 311 | #endif | 319 | #endif |
| 320 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, | ||
| 321 | struct v4l2_chip_ident *chip); | ||
| 312 | 322 | ||
| 313 | 323 | ||
| 314 | #ifdef OBSOLETE_OWNER /* to be removed soon */ | 324 | #ifdef OBSOLETE_OWNER /* to be removed soon */ |
