diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 09:59:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 09:59:37 -0400 |
commit | c1ece76719205690f4b448460d9b85c130e8021b (patch) | |
tree | 01072c593d53ef551788228ea28ce8bc87bc0e45 /Documentation/DocBook/media/v4l/vidioc-overlay.xml | |
parent | fb1b83d3ff78168e10799627f231cf0c05c9d80d (diff) | |
parent | 292eaf50c7df4ae2ae8aaa9e1ce3f1240a353ee8 (diff) |
Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media DocBook removal and some fixups from Mauro Carvalho Chehab:
- removal of the media DocBook (since it's all in Sphinx now)
- videobuf2: Fix an allocation regression
- a few fixes related to the CEC drivers
* tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] cec: fix off-by-one memset
[media] staging: add MEDIA_SUPPORT dependency
[media] vivid: don't handle CEC_MSG_SET_STREAM_PATH
[media] media: adv7180: Fix broken interrupt register access
[media] vb2: Fix allocation size of dma_parms
[media] vim2m: copy the other colorspace-related fields as well
[media] adv7511: fix VIC autodetect
doc-rst: Remove the media docbook
Diffstat (limited to 'Documentation/DocBook/media/v4l/vidioc-overlay.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-overlay.xml | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-overlay.xml b/Documentation/DocBook/media/v4l/vidioc-overlay.xml deleted file mode 100644 index 250a7de1877f..000000000000 --- a/Documentation/DocBook/media/v4l/vidioc-overlay.xml +++ /dev/null @@ -1,74 +0,0 @@ -<refentry id="vidioc-overlay"> - <refmeta> - <refentrytitle>ioctl VIDIOC_OVERLAY</refentrytitle> - &manvol; - </refmeta> - - <refnamediv> - <refname>VIDIOC_OVERLAY</refname> - <refpurpose>Start or stop video overlay</refpurpose> - </refnamediv> - - <refsynopsisdiv> - <funcsynopsis> - <funcprototype> - <funcdef>int <function>ioctl</function></funcdef> - <paramdef>int <parameter>fd</parameter></paramdef> - <paramdef>int <parameter>request</parameter></paramdef> - <paramdef>const int *<parameter>argp</parameter></paramdef> - </funcprototype> - </funcsynopsis> - </refsynopsisdiv> - - <refsect1> - <title>Arguments</title> - - <variablelist> - <varlistentry> - <term><parameter>fd</parameter></term> - <listitem> - <para>&fd;</para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>request</parameter></term> - <listitem> - <para>VIDIOC_OVERLAY</para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>argp</parameter></term> - <listitem> - <para></para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - - <refsect1> - <title>Description</title> - - <para>This ioctl is part of the <link linkend="overlay">video - overlay</link> I/O method. Applications call - <constant>VIDIOC_OVERLAY</constant> to start or stop the - overlay. It takes a pointer to an integer which must be set to - zero by the application to stop overlay, to one to start.</para> - - <para>Drivers do not support &VIDIOC-STREAMON; or -&VIDIOC-STREAMOFF; with <constant>V4L2_BUF_TYPE_VIDEO_OVERLAY</constant>.</para> - </refsect1> - - <refsect1> - &return-value; - - <variablelist> - <varlistentry> - <term><errorcode>EINVAL</errorcode></term> - <listitem> - <para>The overlay parameters have not been set up. See <xref -linkend="overlay" /> for the necessary steps.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> -</refentry> |