diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-14 01:59:54 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-14 01:59:54 -0200 |
commit | af2c8347ec518cf5ff646d2bf560206780775795 (patch) | |
tree | 7f2cfb3c70d3bd0eaa315f0c34da8285e06f7499 /linux/include/media/v4l2-int-device.h | |
parent | 1a97b7617165d0c5f13812dad33afa56efb499ae (diff) | |
parent | 7820558f98ad177a1b4db0882e9f49cc93200aa6 (diff) | |
download | mediapointer-dvb-s2-af2c8347ec518cf5ff646d2bf560206780775795.tar.gz mediapointer-dvb-s2-af2c8347ec518cf5ff646d2bf560206780775795.tar.bz2 |
merge: http://www.linuxtv.org/hg/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-int-device.h')
-rw-r--r-- | linux/include/media/v4l2-int-device.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-int-device.h b/linux/include/media/v4l2-int-device.h index 9c2df41db..ecda3c725 100644 --- a/linux/include/media/v4l2-int-device.h +++ b/linux/include/media/v4l2-int-device.h @@ -183,6 +183,9 @@ enum v4l2_int_ioctl_num { vidioc_int_s_crop_num, vidioc_int_g_parm_num, vidioc_int_s_parm_num, + vidioc_int_querystd_num, + vidioc_int_s_std_num, + vidioc_int_s_video_routing_num, /* * @@ -284,6 +287,9 @@ V4L2_INT_WRAPPER_1(g_crop, struct v4l2_crop, *); V4L2_INT_WRAPPER_1(s_crop, struct v4l2_crop, *); V4L2_INT_WRAPPER_1(g_parm, struct v4l2_streamparm, *); V4L2_INT_WRAPPER_1(s_parm, struct v4l2_streamparm, *); +V4L2_INT_WRAPPER_1(querystd, v4l2_std_id, *); +V4L2_INT_WRAPPER_1(s_std, v4l2_std_id, *); +V4L2_INT_WRAPPER_1(s_video_routing, struct v4l2_routing, *); V4L2_INT_WRAPPER_0(dev_init); V4L2_INT_WRAPPER_0(dev_exit); |