diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-05-23 07:36:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:55:39 -0300 |
| commit | aec67f054205da77f83ba52f83239225d6cbe366 (patch) | |
| tree | a291e77724025a388fbb7acbd041cddbec072b57 /Documentation/DocBook/media/v4l/v4l2.xml | |
| parent | b6d17a56c8431810709794ceb44d2454976e3ce1 (diff) | |
[media] DocBook: document V4L2_CTRL_TYPE_BITMASK
[mchehab@redhat.com: Fix a merge conflict and make compat.xml coherent with v4l2.xml]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook/media/v4l/v4l2.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index 43386a6aef76..0d05e8747c12 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml @@ -87,7 +87,7 @@ Remote Controller chapter.</contrib> </author> <author> - <firstname>Pawel</firstname> + <firstname>Pawel</firstname> <surname>Osciak</surname> <contrib>Designed and documented the multi-planar API.</contrib> <affiliation> @@ -130,9 +130,10 @@ applications. --> <revision> <revnumber>3.1</revnumber> <date>2011-06-27</date> - <authorinitials>mcc, po</authorinitials> - <revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</revremark> - <revremark>Standardize an error code for invalid ioctl.</revremark> + <authorinitials>mcc, po, hv</authorinitials> + <revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one. + Standardize an error code for invalid ioctl. + Added V4L2_CTRL_TYPE_BITMASK.</revremark> </revision> <revision> @@ -409,7 +410,7 @@ and discussions on the V4L mailing list.</revremark> </partinfo> <title>Video for Linux Two API Specification</title> - <subtitle>Revision 2.6.39</subtitle> + <subtitle>Revision 3.1</subtitle> <chapter id="common"> &sub-common; |