Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / Documentation / DocBook / media / v4l / subdev-formats.xml

diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 18730b9..c5ea868 100644 (file)
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -33,9 +33,25 @@
          <entry>Image colorspace, from &v4l2-colorspace;. See
          <xref linkend="colorspaces" /> for details.</entry>
        </row>
+       <row>
+         <entry>&v4l2-ycbcr-encoding;</entry>
+         <entry><structfield>ycbcr_enc</structfield></entry>
+         <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+       </row>
+       <row>
+         <entry>&v4l2-quantization;</entry>
+         <entry><structfield>quantization</structfield></entry>
+         <entry>This information supplements the
+<structfield>colorspace</structfield> and must be set by the driver for
+capture streams and by the application for output streams,
+see <xref linkend="colorspaces" />.</entry>
+       </row>
        <row>
          <entry>__u32</entry>
-         <entry><structfield>reserved</structfield>[7]</entry>
+         <entry><structfield>reserved</structfield>[6]</entry>
          <entry>Reserved for future extensions. Applications and drivers must
          set the array to zero.</entry>
        </row>