aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-03-24 05:08:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-24 12:49:46 -0400
commit4e5f1130070ebfdde1b0ea6277e881404e5f34ce (patch)
tree557a7bba2c45d9de3beb96be595b03653eb03a3f
parent81b8cd9284945a323009482418c3d80de1d59d25 (diff)
[media] DocBook/media/v4l: Update version number and document 3.10 changes
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/DocBook/media/v4l/compat.xml13
-rw-r--r--Documentation/DocBook/media/v4l/v4l2.xml12
2 files changed, 25 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index effa5094a2f8..5dab33837344 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2493,6 +2493,19 @@ that used it. It was originally scheduled for removal in 2.6.35.
2493 </orderedlist> 2493 </orderedlist>
2494 </section> 2494 </section>
2495 2495
2496 <section>
2497 <title>V4L2 in Linux 3.10</title>
2498 <orderedlist>
2499 <listitem>
2500 <para>Removed obsolete and unused DV_PRESET ioctls
2501 VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET, VIDIOC_QUERY_DV_PRESET and
2502 VIDIOC_ENUM_DV_PRESET. Remove the related v4l2_input/output capability
2503 flags V4L2_IN_CAP_PRESETS and V4L2_OUT_CAP_PRESETS.
2504 </para>
2505 </listitem>
2506 </orderedlist>
2507 </section>
2508
2496 <section id="other"> 2509 <section id="other">
2497 <title>Relation of V4L2 to other Linux multimedia APIs</title> 2510 <title>Relation of V4L2 to other Linux multimedia APIs</title>
2498 2511
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index 32a10eef3958..dae009aa2440 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -124,6 +124,7 @@ Remote Controller chapter.</contrib>
124 <year>2010</year> 124 <year>2010</year>
125 <year>2011</year> 125 <year>2011</year>
126 <year>2012</year> 126 <year>2012</year>
127 <year>2013</year>
127 <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin 128 <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin
128Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab, 129Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab,
129 Pawel Osciak</holder> 130 Pawel Osciak</holder>
@@ -140,6 +141,17 @@ structs, ioctls) must be noted in more detail in the history chapter
140applications. --> 141applications. -->
141 142
142 <revision> 143 <revision>
144 <revnumber>3.10</revnumber>
145 <date>2013-03-24</date>
146 <authorinitials>hv</authorinitials>
147 <revremark>Remove obsolete and unused DV_PRESET ioctls:
148 VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET, VIDIOC_QUERY_DV_PRESET and
149 VIDIOC_ENUM_DV_PRESET. Remove the related v4l2_input/output capability
150 flags V4L2_IN_CAP_PRESETS and V4L2_OUT_CAP_PRESETS.
151 </revremark>
152 </revision>
153
154 <revision>
143 <revnumber>3.9</revnumber> 155 <revnumber>3.9</revnumber>
144 <date>2012-12-03</date> 156 <date>2012-12-03</date>
145 <authorinitials>sa, sn</authorinitials> 157 <authorinitials>sa, sn</authorinitials>