diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-06-27 09:12:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-06 23:12:50 -0400 |
commit | ec3ed85f926f4e900bc48cec6e72abbe6475321f (patch) | |
tree | 1affe0f0a5ba3a209ba2c9071e3ee00b3bca01bf /Documentation/DocBook | |
parent | 4e39da01027eb73556c1ad416945e37f2771464e (diff) |
[media] Revert "[media] V4L: JPEG class documentation corrections"
This reverts commit feed0258e11e04b7e0, as the same issues
are already covered in another version of that patch that
was also applied (579e92ffac65c717c9c8a50feb755a).
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 89941329290e..43ca749fc5e3 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
@@ -3988,7 +3988,7 @@ interface and may change in the future.</para> | |||
3988 | from RGB to Y'CbCr color space. | 3988 | from RGB to Y'CbCr color space. |
3989 | </entry> | 3989 | </entry> |
3990 | </row> | 3990 | </row> |
3991 | <row id = "v4l2-jpeg-chroma-subsampling"> | 3991 | <row> |
3992 | <entrytbl spanname="descr" cols="2"> | 3992 | <entrytbl spanname="descr" cols="2"> |
3993 | <tbody valign="top"> | 3993 | <tbody valign="top"> |
3994 | <row> | 3994 | <row> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml index e3d5afcdafbb..0a4b90fcf2da 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml | |||
@@ -284,13 +284,6 @@ These controls are described in <xref | |||
284 | processing controls. These controls are described in <xref | 284 | processing controls. These controls are described in <xref |
285 | linkend="image-process-controls" />.</entry> | 285 | linkend="image-process-controls" />.</entry> |
286 | </row> | 286 | </row> |
287 | <row> | ||
288 | <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry> | ||
289 | <entry>0x9d0000</entry> | ||
290 | <entry>The class containing JPEG compression controls. | ||
291 | These controls are described in <xref | ||
292 | linkend="jpeg-controls" />.</entry> | ||
293 | </row> | ||
294 | </tbody> | 287 | </tbody> |
295 | </tgroup> | 288 | </tgroup> |
296 | </table> | 289 | </table> |