diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-28 12:48:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-03 14:14:16 -0400 |
commit | dcc29cbcec8c8482eea249030e0aa65b7451073d (patch) | |
tree | 2da96412396af867c9a50df17cf2b136001de575 /include/linux/videodev2.h | |
parent | 92b2db08b1150576d295ba9440e172675095c3ae (diff) |
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.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 253a7ed3abb3..c5fdf6259548 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -276,6 +276,8 @@ struct v4l2_fmtdesc | |||
276 | 276 | ||
277 | #define V4L2_FMT_FLAG_COMPRESSED 0x0001 | 277 | #define V4L2_FMT_FLAG_COMPRESSED 0x0001 |
278 | 278 | ||
279 | #if 1 | ||
280 | /* Experimental Frame Size and frame rate enumeration */ | ||
279 | /* | 281 | /* |
280 | * F R A M E S I Z E E N U M E R A T I O N | 282 | * F R A M E S I Z E E N U M E R A T I O N |
281 | */ | 283 | */ |
@@ -348,6 +350,7 @@ struct v4l2_frmivalenum | |||
348 | 350 | ||
349 | __u32 reserved[2]; /* Reserved space for future use */ | 351 | __u32 reserved[2]; /* Reserved space for future use */ |
350 | }; | 352 | }; |
353 | #endif | ||
351 | 354 | ||
352 | /* | 355 | /* |
353 | * T I M E C O D E | 356 | * T I M E C O D E |
@@ -1322,8 +1325,10 @@ struct v4l2_streamparm | |||
1322 | #define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) | 1325 | #define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls) |
1323 | #define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls) | 1326 | #define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls) |
1324 | #define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls) | 1327 | #define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls) |
1328 | #if 1 | ||
1325 | #define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum) | 1329 | #define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum) |
1326 | #define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum) | 1330 | #define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum) |
1331 | #endif | ||
1327 | 1332 | ||
1328 | #ifdef __OLD_VIDIOC_ | 1333 | #ifdef __OLD_VIDIOC_ |
1329 | /* for compatibility, will go away some day */ | 1334 | /* for compatibility, will go away some day */ |