diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-27 06:24:58 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:12 -0500 |
| commit | 1fb03673b9eddb55a08174d0952c0a1c2438997e (patch) | |
| tree | 425af768fdccce04cd49eaa9470b2a5e729558b0 /Documentation | |
| parent | 38af87869e7a255b6ba0f41bf53d2e7b0a54d13b (diff) | |
[media] Fix videodev.h references at the V4L DocBook
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/v4l/func-ioctl.xml | 5 | ||||
| -rw-r--r-- | Documentation/DocBook/v4l/pixfmt.xml | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/DocBook/v4l/func-ioctl.xml b/Documentation/DocBook/v4l/func-ioctl.xml index 00f9690e1c28..b60fd37a6295 100644 --- a/Documentation/DocBook/v4l/func-ioctl.xml +++ b/Documentation/DocBook/v4l/func-ioctl.xml | |||
| @@ -34,8 +34,7 @@ | |||
| 34 | <varlistentry> | 34 | <varlistentry> |
| 35 | <term><parameter>request</parameter></term> | 35 | <term><parameter>request</parameter></term> |
| 36 | <listitem> | 36 | <listitem> |
| 37 | <para>V4L2 ioctl request code as defined in the <link | 37 | <para>V4L2 ioctl request code as defined in the <filename>videodev2.h</filename> header file, for example |
| 38 | linkend="videodev">videodev.h</link> header file, for example | ||
| 39 | VIDIOC_QUERYCAP.</para> | 38 | VIDIOC_QUERYCAP.</para> |
| 40 | </listitem> | 39 | </listitem> |
| 41 | </varlistentry> | 40 | </varlistentry> |
| @@ -57,7 +56,7 @@ file descriptor. An ioctl <parameter>request</parameter> has encoded | |||
| 57 | in it whether the argument is an input, output or read/write | 56 | in it whether the argument is an input, output or read/write |
| 58 | parameter, and the size of the argument <parameter>argp</parameter> in | 57 | parameter, and the size of the argument <parameter>argp</parameter> in |
| 59 | bytes. Macros and defines specifying V4L2 ioctl requests are located | 58 | bytes. Macros and defines specifying V4L2 ioctl requests are located |
| 60 | in the <link linkend="videodev">videodev.h</link> header file. | 59 | in the <filename>videodev2.h</filename> header file. |
| 61 | Applications should use their own copy, not include the version in the | 60 | Applications should use their own copy, not include the version in the |
| 62 | kernel sources on the system they compile on. All V4L2 ioctl requests, | 61 | kernel sources on the system they compile on. All V4L2 ioctl requests, |
| 63 | their respective function and parameters are specified in <xref | 62 | their respective function and parameters are specified in <xref |
diff --git a/Documentation/DocBook/v4l/pixfmt.xml b/Documentation/DocBook/v4l/pixfmt.xml index d7c467187095..cfffc88d7383 100644 --- a/Documentation/DocBook/v4l/pixfmt.xml +++ b/Documentation/DocBook/v4l/pixfmt.xml | |||
| @@ -142,8 +142,8 @@ leftmost pixel of the second row from the top, and so on. The last row | |||
| 142 | has just as many pad bytes after it as the other rows.</para> | 142 | has just as many pad bytes after it as the other rows.</para> |
| 143 | 143 | ||
| 144 | <para>In V4L2 each format has an identifier which looks like | 144 | <para>In V4L2 each format has an identifier which looks like |
| 145 | <constant>PIX_FMT_XXX</constant>, defined in the <link | 145 | <constant>PIX_FMT_XXX</constant>, defined in the <filename>videodev2.h</filename> |
| 146 | linkend="videodev">videodev.h</link> header file. These identifiers | 146 | header file. These identifiers |
| 147 | represent <link linkend="v4l2-fourcc">four character codes</link> | 147 | represent <link linkend="v4l2-fourcc">four character codes</link> |
| 148 | which are also listed below, however they are not the same as those | 148 | which are also listed below, however they are not the same as those |
| 149 | used in the Windows world.</para> | 149 | used in the Windows world.</para> |