summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/v4l
diff options
context:
space:
mode:
authorPawel Osciak <pawel@osciak.com>2011-03-13 21:20:22 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 10:55:04 +0300
commitf0e3b646ccce66c9e878966227ce8415d3c11c2a (patch)
tree8550734ecf4ebef1817c2c381268d372d266c176 /Documentation/DocBook/v4l
parent6ed9d56086acb3bb4ec003ff6d2f54313774d72b (diff)
downloadlinux-f0e3b646ccce66c9e878966227ce8415d3c11c2a.tar.xz
[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>
Diffstat (limited to 'Documentation/DocBook/v4l')
-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.
</orderedlist>
</section>
<section>
- <title>V4L2 in Linux 2.6.38</title>
+ <title>V4L2 in Linux 2.6.39</title>
<orderedlist>
<listitem>
+ <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
+ </listitem>
+ <listitem>
<para>Multi-planar API added. Does not affect the compatibility of
current drivers and applications. See
<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.
</listitem>
</orderedlist>
</section>
- <section>
- <title>V4L2 in Linux 2.6.39</title>
- <orderedlist>
- <listitem>
- <para>The old VIDIOC_*_OLD symbols and V4L1 support were removed.</para>
- </listitem>
- </orderedlist>
- </section>
<section id="other">
<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. -->
<revision>
<revnumber>2.6.39</revnumber>
<date>2011-03-01</date>
- <authorinitials>mcc</authorinitials>
- <revremark>Removed VIDIOC_*_OLD from videodev2.h header and update it to reflect latest changes.
- </revremark>
- </revision>
-
- <revision>
- <revnumber>2.6.38</revnumber>
- <date>2011-01-16</date>
- <authorinitials>po</authorinitials>
- <revremark>Added the <link linkend="planar-apis">multi-planar API</link>.
- </revremark>
+ <authorinitials>mcc, po</authorinitials>
+ <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>
</revision>
<revision>