aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/videodev2.h
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-10-03 15:14:16 -0300
commitdcc29cbcec8c8482eea249030e0aa65b7451073d (patch)
tree2da96412396af867c9a50df17cf2b136001de575 /include/linux/videodev2.h
parent92b2db08b1150576d295ba9440e172675095c3ae (diff)
downloadkernel_samsung_smdk4412-dcc29cbcec8c8482eea249030e0aa65b7451073d.zip
kernel_samsung_smdk4412-dcc29cbcec8c8482eea249030e0aa65b7451073d.tar.gz
kernel_samsung_smdk4412-dcc29cbcec8c8482eea249030e0aa65b7451073d.tar.bz2
V4L/DVB (4673): Mark the two newer ioctls as experimental
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 'include/linux/videodev2.h')
-rw-r--r--include/linux/videodev2.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 253a7ed..c5fdf62 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -276,6 +276,8 @@ struct v4l2_fmtdesc
#define V4L2_FMT_FLAG_COMPRESSED 0x0001
+#if 1
+ /* 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
@@ -1322,8 +1325,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
#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 */