diff options
Diffstat (limited to 'Documentation/DocBook/v4l')
-rw-r--r-- | Documentation/DocBook/v4l/common.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/controls.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/dev-subdev.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/libv4l.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/remote_controllers.xml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/v4l/common.xml index dbab79c215c1..9028721438dc 100644 --- a/Documentation/DocBook/v4l/common.xml +++ b/Documentation/DocBook/v4l/common.xml | |||
@@ -100,7 +100,7 @@ linux-kernel@vger.kernel.org, 2002-11-20. --></para> | |||
100 | 100 | ||
101 | <para>By convention system administrators create various | 101 | <para>By convention system administrators create various |
102 | character device special files with these major and minor numbers in | 102 | character device special files with these major and minor numbers in |
103 | the <filename>/dev</filename> directory. The names recomended for the | 103 | the <filename>/dev</filename> directory. The names recommended for the |
104 | different V4L2 device types are listed in <xref linkend="devices" />. | 104 | different V4L2 device types are listed in <xref linkend="devices" />. |
105 | </para> | 105 | </para> |
106 | 106 | ||
diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml index 2fae3e87ce73..a920ee80f640 100644 --- a/Documentation/DocBook/v4l/controls.xml +++ b/Documentation/DocBook/v4l/controls.xml | |||
@@ -1243,7 +1243,7 @@ values are:</entry> | |||
1243 | </row><row><entry spanname="descr">Mutes the audio when | 1243 | </row><row><entry spanname="descr">Mutes the audio when |
1244 | capturing. This is not done by muting audio hardware, which can still | 1244 | capturing. This is not done by muting audio hardware, which can still |
1245 | produce a slight hiss, but in the encoder itself, guaranteeing a fixed | 1245 | produce a slight hiss, but in the encoder itself, guaranteeing a fixed |
1246 | and reproducable audio bitstream. 0 = unmuted, 1 = muted.</entry> | 1246 | and reproducible audio bitstream. 0 = unmuted, 1 = muted.</entry> |
1247 | </row> | 1247 | </row> |
1248 | <row><entry></entry></row> | 1248 | <row><entry></entry></row> |
1249 | <row id="v4l2-mpeg-video-encoding"> | 1249 | <row id="v4l2-mpeg-video-encoding"> |
diff --git a/Documentation/DocBook/v4l/dev-subdev.xml b/Documentation/DocBook/v4l/dev-subdev.xml index 21caff6d159b..05c8fefcbcbe 100644 --- a/Documentation/DocBook/v4l/dev-subdev.xml +++ b/Documentation/DocBook/v4l/dev-subdev.xml | |||
@@ -90,7 +90,7 @@ | |||
90 | processing hardware.</para> | 90 | processing hardware.</para> |
91 | 91 | ||
92 | <figure id="pipeline-scaling"> | 92 | <figure id="pipeline-scaling"> |
93 | <title>Image Format Negotation on Pipelines</title> | 93 | <title>Image Format Negotiation on Pipelines</title> |
94 | <mediaobject> | 94 | <mediaobject> |
95 | <imageobject> | 95 | <imageobject> |
96 | <imagedata fileref="pipeline.pdf" format="PS" /> | 96 | <imagedata fileref="pipeline.pdf" format="PS" /> |
diff --git a/Documentation/DocBook/v4l/libv4l.xml b/Documentation/DocBook/v4l/libv4l.xml index c14fc3db2a81..3cb10ec51929 100644 --- a/Documentation/DocBook/v4l/libv4l.xml +++ b/Documentation/DocBook/v4l/libv4l.xml | |||
@@ -140,7 +140,7 @@ and is not locked sets the cid to the scaled value. | |||
140 | <para>int v4l2_get_control(int fd, int cid) - | 140 | <para>int v4l2_get_control(int fd, int cid) - |
141 | This function returns a value of 0 - 65535, scaled to from the actual range | 141 | This function returns a value of 0 - 65535, scaled to from the actual range |
142 | of the given v4l control id. when the cid does not exist, could not be | 142 | of the given v4l control id. when the cid does not exist, could not be |
143 | accessed for some reason, or some error occured 0 is returned. | 143 | accessed for some reason, or some error occurred 0 is returned. |
144 | </para></listitem> | 144 | </para></listitem> |
145 | </itemizedlist> | 145 | </itemizedlist> |
146 | </section> | 146 | </section> |
diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/v4l/remote_controllers.xml index 3c3b667b28e7..160e464d44b7 100644 --- a/Documentation/DocBook/v4l/remote_controllers.xml +++ b/Documentation/DocBook/v4l/remote_controllers.xml | |||
@@ -133,7 +133,7 @@ different IR's. Due to that, V4L2 API now specifies a standard for mapping Media | |||
133 | <row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row> | 133 | <row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row> |
134 | <row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row> | 134 | <row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row> |
135 | 135 | ||
136 | <row><entry><emphasis role="bold">Miscelaneous keys</emphasis></entry></row> | 136 | <row><entry><emphasis role="bold">Miscellaneous keys</emphasis></entry></row> |
137 | 137 | ||
138 | <row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row> | 138 | <row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row> |
139 | <row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row> | 139 | <row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row> |