From 017d433090bcc8eda065529590d12037df0d7ec3 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Date: Sat, 31 Mar 2012 05:43:55 -0300
Subject: [PATCH] --- yaml --- r: 306157 b: refs/heads/master c:
 feed0258e11e04b7e0d2df8ae3793ab5d302a035 h: refs/heads/master i:   306155:
 2415e7a90436a8b2092e49ee5ebc765a15a41ce4 v: v3

---
 [refs]                                                     | 2 +-
 trunk/Documentation/DocBook/media/v4l/controls.xml         | 2 +-
 .../Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5c559d92600c..bdbf442a1eb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9d1ae81dc9abfa7e6a2128989cca35a9bdea57b
+refs/heads/master: feed0258e11e04b7e0d2df8ae3793ab5d302a035
diff --git a/trunk/Documentation/DocBook/media/v4l/controls.xml b/trunk/Documentation/DocBook/media/v4l/controls.xml
index b84f25e9cc87..5038a3a9a24c 100644
--- a/trunk/Documentation/DocBook/media/v4l/controls.xml
+++ b/trunk/Documentation/DocBook/media/v4l/controls.xml
@@ -3486,7 +3486,7 @@ interface and may change in the future.</para>
 	    from RGB to Y'CbCr color space.
 	    </entry>
 	  </row>
-	  <row>
+	  <row id = "v4l2-jpeg-chroma-subsampling">
 	    <entrytbl spanname="descr" cols="2">
 	      <tbody valign="top">
 		<row>
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
index b17a7aac6997..27e20bcbdf42 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
@@ -265,6 +265,13 @@ These controls are described in <xref
 These controls are described in <xref
 		linkend="flash-controls" />.</entry>
 	  </row>
+	  <row>
+	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
+	    <entry>0x9d0000</entry>
+	    <entry>The class containing JPEG compression controls.
+These controls are described in <xref
+		linkend="jpeg-controls" />.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>