aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/v4l/controls.xml6
-rw-r--r--include/linux/videodev2.h5
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml
index f46450610412..e1bdbb6eff84 100644
--- a/Documentation/DocBook/v4l/controls.xml
+++ b/Documentation/DocBook/v4l/controls.xml
@@ -267,6 +267,12 @@ minimum value disables backlight compensation.</entry>
267 <entry>Chroma automatic gain control.</entry> 267 <entry>Chroma automatic gain control.</entry>
268 </row> 268 </row>
269 <row> 269 <row>
270 <entry><constant>V4L2_CID_CHROMA_GAIN</constant></entry>
271 <entry>integer</entry>
272 <entry>Adjusts the Chroma gain control (for use when chroma AGC
273 is disabled).</entry>
274 </row>
275 <row>
270 <entry><constant>V4L2_CID_COLOR_KILLER</constant></entry> 276 <entry><constant>V4L2_CID_COLOR_KILLER</constant></entry>
271 <entry>boolean</entry> 277 <entry>boolean</entry>
272 <entry>Enable the color killer (&ie; force a black &amp; white image in case of a weak video signal).</entry> 278 <entry>Enable the color killer (&ie; force a black &amp; white image in case of a weak video signal).</entry>
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 3c265603d735..418dacf5261d 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1030,8 +1030,11 @@ enum v4l2_colorfx {
1030 1030
1031#define V4L2_CID_ROTATE (V4L2_CID_BASE+34) 1031#define V4L2_CID_ROTATE (V4L2_CID_BASE+34)
1032#define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35) 1032#define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35)
1033
1034#define V4L2_CID_CHROMA_GAIN (V4L2_CID_BASE+36)
1035
1033/* last CID + 1 */ 1036/* last CID + 1 */
1034#define V4L2_CID_LASTP1 (V4L2_CID_BASE+36) 1037#define V4L2_CID_LASTP1 (V4L2_CID_BASE+37)
1035 1038
1036/* MPEG-class control IDs defined by V4L2 */ 1039/* MPEG-class control IDs defined by V4L2 */
1037#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) 1040#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)