---

yaml
---
r: 311903
b: refs/heads/master
c: ec3ed85
h: refs/heads/master
i:
  311901: fb02fe5
  311899: cc88824
  311895: d4623d8
  311887: d98e674
  311871: ff283ca
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e39da01027eb73556c1ad416945e37f2771464e
+refs/heads/master: ec3ed85f926f4e900bc48cec6e72abbe6475321f

trunk/Documentation/DocBook/media/v4l/controls.xml

@@ -3988,7 +3988,7 @@ interface and may change in the future.</para>
 	    from RGB to Y'CbCr color space.
 	    </entry>
 	  </row>
-	  <row id = "v4l2-jpeg-chroma-subsampling">
+	  <row>
 	    <entrytbl spanname="descr" cols="2">
 	      <tbody valign="top">
 		<row>

trunk/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

@@ -284,13 +284,6 @@ These controls are described in <xref
 	    processing controls. These controls are described in <xref
 	    linkend="image-process-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>