summaryrefslogtreecommitdiff
path: root/linux/include/media/v4l2-subdev.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-20 02:42:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-20 02:42:34 -0300
commit9f85fbc44d99a2327bf2fb9be850bb9844c8c8c7 (patch)
tree0324b3b860c87deb12ebf9db240678d402302f01 /linux/include/media/v4l2-subdev.h
parentd1f8343e844fdb906b58a31d33e5d69c8e7853ad (diff)
parent94a0e644a33260b89beb679752d5da322e1474c4 (diff)
downloadmediapointer-dvb-s2-9f85fbc44d99a2327bf2fb9be850bb9844c8c8c7.tar.gz
mediapointer-dvb-s2-9f85fbc44d99a2327bf2fb9be850bb9844c8c8c7.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cafe
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-subdev.h')
-rw-r--r--linux/include/media/v4l2-subdev.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h
index 1b97a2c33..d7a72d2d1 100644
--- a/linux/include/media/v4l2-subdev.h
+++ b/linux/include/media/v4l2-subdev.h
@@ -118,8 +118,12 @@ struct v4l2_subdev_video_ops {
int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
int (*s_stream)(struct v4l2_subdev *sd, int enable);
- int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+ int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+ int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+ int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+ int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
+ int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
};
struct v4l2_subdev_ops {