aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Osciak <pawel@osciak.com>2011-03-13 14:20:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 03:55:04 -0400
commitf0e3b646ccce66c9e878966227ce8415d3c11c2a (patch)
tree8550734ecf4ebef1817c2c381268d372d266c176
parent6ed9d56086acb3bb4ec003ff6d2f54313774d72b (diff)
[media] Make 2.6.39 not 2.6.38 the version when Multi-planar API was added
Multi-planar API was added to 2.6.39 version of Video for Linux 2 API. Signed-off-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/DocBook/v4l/compat.xml13
-rw-r--r--Documentation/DocBook/v4l/v4l2.xml13
2 files changed, 6 insertions, 20 deletions
diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml
index 4d74bf24e114..9f7cd4f25792 100644
--- a/Documentation/DocBook/v4l/compat.xml
+++ b/Documentation/DocBook/v4l/compat.xml
@@ -2354,9 +2354,12 @@ that used it. It was originally scheduled for removal in 2.6.35.
2354 </orderedlist> 2354 </orderedlist>
2355 </section> 2355 </section>
2356 <section> 2356 <section>
2357 <title>V4L2 in Linux 2.6.38</title> 2357 <title>V4L2 in Linux 2.6.39</title>
2358 <orderedlist> 2358 <orderedlist>
2359 <listitem> 2359 <listitem>
2360 <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
2361 </listitem>
2362 <listitem>
2360 <para>Multi-planar API added. Does not affect the compatibility of 2363 <para>Multi-planar API added. Does not affect the compatibility of
2361 current drivers and applications. See 2364 current drivers and applications. See
2362 <link linkend="planar-apis">multi-planar API</link> 2365 <link linkend="planar-apis">multi-planar API</link>
@@ -2364,14 +2367,6 @@ that used it. It was originally scheduled for removal in 2.6.35.
2364 </listitem> 2367 </listitem>
2365 </orderedlist> 2368 </orderedlist>
2366 </section> 2369 </section>
2367 <section>
2368 <title>V4L2 in Linux 2.6.39</title>
2369 <orderedlist>
2370 <listitem>
2371 <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
2372 </listitem>
2373 </orderedlist>
2374 </section>
2375 2370
2376 <section id="other"> 2371 <section id="other">
2377 <title>Relation of V4L2 to other Linux multimedia APIs</title> 2372 <title>Relation of V4L2 to other Linux multimedia APIs</title>
diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
index ae7a069d61d5..a7fd76d0dac1 100644
--- a/Documentation/DocBook/v4l/v4l2.xml
+++ b/Documentation/DocBook/v4l/v4l2.xml
@@ -130,17 +130,8 @@ applications. -->
130 <revision> 130 <revision>
131 <revnumber>2.6.39</revnumber> 131 <revnumber>2.6.39</revnumber>
132 <date>2011-03-01</date> 132 <date>2011-03-01</date>
133 <authorinitials>mcc</authorinitials> 133 <authorinitials>mcc, po</authorinitials>
134 <revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. 134 <revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes. Added the <link linkend="planar-apis">multi-planar API</link>.</revremark>
135 </revremark>
136 </revision>
137
138 <revision>
139 <revnumber>2.6.38</revnumber>
140 <date>2011-01-16</date>
141 <authorinitials>po</authorinitials>
142 <revremark>Added the <link linkend="planar-apis">multi-planar API</link>.
143 </revremark>
144 </revision> 135 </revision>
145 136
146 <revision> 137 <revision>