summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-28 13:48:26 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-28 13:48:26 -0300
commit59f58677a8880937bdab0ca6cee7c0176ee1d44a (patch)
tree1ff9c08baa32c330a9021021493affe1214b0e79 /linux
parentb23b7d2a8d967834e5be01ec654e53ce6a1edf8e (diff)
downloadmediapointer-dvb-s2-59f58677a8880937bdab0ca6cee7c0176ee1d44a.tar.gz
mediapointer-dvb-s2-59f58677a8880937bdab0ca6cee7c0176ee1d44a.tar.bz2
Mark the two newer ioctls as experimental
From: Mauro Carvalho Chehab <mchehab@infradead.org> VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS ioctls are meant to be used to provide better support for webcams. Currently, it is not yet used on kernel drivers. Better to keep it marked as experimental, until we have several kernel drivers supporting those features. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/include/linux/videodev2.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index c3c175f93..f886a85ac 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -276,6 +276,8 @@ struct v4l2_fmtdesc
#define V4L2_FMT_FLAG_COMPRESSED 0x0001
+#if 1 /*KEEP*/
+ /* Experimental Frame Size and frame rate enumeration */
/*
* F R A M E S I Z E E N U M E R A T I O N
*/
@@ -348,6 +350,7 @@ struct v4l2_frmivalenum
__u32 reserved[2]; /* Reserved space for future use */
};
+#endif
/*
* T I M E C O D E
@@ -1388,8 +1391,10 @@ struct v4l2_streamparm
#define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls)
#define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls)
#define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls)
+#if 1 /*KEEP*/
#define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum)
#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum)
+#endif
#ifdef __OLD_VIDIOC_
/* for compatibility, will go away some day */