4 files changed, 73 insertions, 4 deletions

diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index 0a2debfa68f6..350dfb3d71ea 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2579,6 +2579,18 @@ fields changed from _s32 to _u32.
       </orderedlist>
     </section>
 
+    <section>
+      <title>V4L2 in Linux 3.19</title>
+      <orderedlist>
+        <listitem>
+          <para>Rewrote Colorspace chapter, added new &v4l2-ycbcr-encoding;
+and &v4l2-quantization; fields to &v4l2-pix-format;, &v4l2-pix-format-mplane;
+and &v4l2-mbus-framefmt;.
+          </para>
+        </listitem>
+      </orderedlist>
+    </section>
+
     <section id="other">
       <title>Relation of V4L2 to other Linux multimedia APIs</title>
 
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
index ccf6053c1ae4..d5eca4b8f74b 100644
--- 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>
@@ -232,9 +248,25 @@ codes can be used.</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>
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 18730b96e1e6..c5ea868e3909 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -34,8 +34,24 @@
           <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>
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index 7cfe618f754d..ac0f8d9d2a49 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -152,6 +152,15 @@ structs, ioctls) must be noted in more detail in the history chapter
 applications. -->
 
       <revision>
+        <revnumber>3.19</revnumber>
+        <date>2014-12-05</date>
+        <authorinitials>hv</authorinitials>
+        <revremark>Rewrote Colorspace chapter, added new &v4l2-ycbcr-encoding; and &v4l2-quantization; fields
+to &v4l2-pix-format;, &v4l2-pix-format-mplane; and &v4l2-mbus-framefmt;.
+        </revremark>
+      </revision>
+
+      <revision>
         <revnumber>3.17</revnumber>
         <date>2014-08-04</date>
         <authorinitials>lp, hv</authorinitials>
@@ -539,7 +548,7 @@ and discussions on the V4L mailing list.</revremark>
 </partinfo>
 
 <title>Video for Linux Two API Specification</title>
- <subtitle>Revision 3.17</subtitle>
+ <subtitle>Revision 3.19</subtitle>
 
   <chapter id="common">
     &sub-common;