From 570c7e8daa1d58af588888b8a069d6ff91565afa Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 16 Jan 2011 17:21:02 -0300 Subject: [PATCH] --- yaml --- r: 241815 b: refs/heads/master c: db4d56835e07ec793f143431170ba2fc17bf0191 h: refs/heads/master i: 241813: 139b60342436d32e8379de206c232795210d275b 241811: 685bb1fa61558d3dc9250e35f30d2dd9f4a0f3a3 241807: 735055587b626985c1569c5594bea6ee0a1f4877 v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/v4l/planar-apis.xml | 14 +++++++------- trunk/Documentation/DocBook/v4l/v4l2.xml | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index de9ff33823c7..e66804530f12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e007a32526e9c5fc2746f0b84a32d3355f129634 +refs/heads/master: db4d56835e07ec793f143431170ba2fc17bf0191 diff --git a/trunk/Documentation/DocBook/v4l/planar-apis.xml b/trunk/Documentation/DocBook/v4l/planar-apis.xml index 8be7552b37de..7f3f5527057e 100644 --- a/trunk/Documentation/DocBook/v4l/planar-apis.xml +++ b/trunk/Documentation/DocBook/v4l/planar-apis.xml @@ -53,28 +53,28 @@ &VIDIOC-QUERYCAP; - Two additional multi-planar capabilities are added. They can + Two additional multi-planar capabilities are added. They can be set together with non-multi-planar ones for devices that handle - both single- and multi-planar formats. + both single- and multi-planar formats. &VIDIOC-G-FMT;, &VIDIOC-S-FMT;, &VIDIOC-TRY-FMT; - New structures for describing multi-planar formats are added: + New structures for describing multi-planar formats are added: &v4l2-pix-format-mplane; and &v4l2-plane-pix-format;. Drivers may define new multi-planar formats, which have distinct FourCC codes from - the existing single-planar ones. + the existing single-planar ones. &VIDIOC-QBUF;, &VIDIOC-DQBUF;, &VIDIOC-QUERYBUF; - A new &v4l2-plane; structure for describing planes is added. + A new &v4l2-plane; structure for describing planes is added. Arrays of this structure are passed in the new - m.planes field of &v4l2-buffer;. + m.planes field of &v4l2-buffer;. &VIDIOC-REQBUFS; - Will allocate multi-planar buffers as requested. + Will allocate multi-planar buffers as requested. diff --git a/trunk/Documentation/DocBook/v4l/v4l2.xml b/trunk/Documentation/DocBook/v4l/v4l2.xml index 9c7a1751ba1e..c3d699173c17 100644 --- a/trunk/Documentation/DocBook/v4l/v4l2.xml +++ b/trunk/Documentation/DocBook/v4l/v4l2.xml @@ -129,6 +129,7 @@ applications. --> 2.6.38 + 2011-01-16 po Added the multi-planar API.