diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-05-23 06:36:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:55:39 -0400 |
commit | aec67f054205da77f83ba52f83239225d6cbe366 (patch) | |
tree | a291e77724025a388fbb7acbd041cddbec072b57 /Documentation/DocBook/media/v4l/compat.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/compat.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index b010ac6bfd2c..d7c015e8df81 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -2360,6 +2360,16 @@ that used it. It was originally scheduled for removal in 2.6.35. | |||
2360 | </listitem> | 2360 | </listitem> |
2361 | </orderedlist> | 2361 | </orderedlist> |
2362 | </section> | 2362 | </section> |
2363 | <section> | ||
2364 | <title>V4L2 in Linux 3.1</title> | ||
2365 | <orderedlist> | ||
2366 | <listitem> | ||
2367 | <para>VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</para> | ||
2368 | <para>Standardize an error code for invalid ioctl.</para> | ||
2369 | <para>Added V4L2_CTRL_TYPE_BITMASK.</para> | ||
2370 | </listitem> | ||
2371 | </orderedlist> | ||
2372 | </section> | ||
2363 | 2373 | ||
2364 | <section id="other"> | 2374 | <section id="other"> |
2365 | <title>Relation of V4L2 to other Linux multimedia APIs</title> | 2375 | <title>Relation of V4L2 to other Linux multimedia APIs</title> |