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

[cascardo/linux.git] / Documentation / DocBook / media / v4l / pixfmt.xml

diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index ccf6053..d5eca4b 100644 (file)
--- a/Documentation/DocBook/media/v4l/pixfmt.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -138,9 +138,25 @@ applicable values.</para></entry>
        <row>
          <entry>__u32</entry>
          <entry><structfield>flags</structfield></entry>
-           <entry>Flags set by the application or driver, see <xref
+         <entry>Flags set by the application or driver, see <xref
 linkend="format-flags" />.</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>
       </tbody>
     </tgroup>
   </table>
@@ -231,10 +247,26 @@ codes can be used.</entry>
          <entry><structfield>flags</structfield></entry>
          <entry>Flags set by the application or driver, see <xref
 linkend="format-flags" />.</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>__u8</entry>
-          <entry><structfield>reserved[10]</structfield></entry>
+          <entry><structfield>reserved[8]</structfield></entry>
           <entry>Reserved for future extensions. Should be zeroed by the
            application.</entry>
         </row>