diff options
Diffstat (limited to 'Documentation/DocBook/media/v4l/io.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/io.xml | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml index 1885cc0755cb..97f785add841 100644 --- a/Documentation/DocBook/media/v4l/io.xml +++ b/Documentation/DocBook/media/v4l/io.xml | |||
@@ -613,8 +613,8 @@ field is independent of the <structfield>timestamp</structfield> and | |||
613 | <entry>__u32</entry> | 613 | <entry>__u32</entry> |
614 | <entry><structfield>sequence</structfield></entry> | 614 | <entry><structfield>sequence</structfield></entry> |
615 | <entry></entry> | 615 | <entry></entry> |
616 | <entry>Set by the driver, counting the frames in the | 616 | <entry>Set by the driver, counting the frames (not fields!) in |
617 | sequence.</entry> | 617 | sequence. This field is set for both input and output devices.</entry> |
618 | </row> | 618 | </row> |
619 | <row> | 619 | <row> |
620 | <entry spanname="hspan"><para>In <link | 620 | <entry spanname="hspan"><para>In <link |
@@ -685,18 +685,14 @@ memory, set by the application. See <xref linkend="userp" /> for details. | |||
685 | <entry>__u32</entry> | 685 | <entry>__u32</entry> |
686 | <entry><structfield>reserved2</structfield></entry> | 686 | <entry><structfield>reserved2</structfield></entry> |
687 | <entry></entry> | 687 | <entry></entry> |
688 | <entry>A place holder for future extensions and custom | 688 | <entry>A place holder for future extensions. Applications |
689 | (driver defined) buffer types | ||
690 | <constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications | ||
691 | should set this to 0.</entry> | 689 | should set this to 0.</entry> |
692 | </row> | 690 | </row> |
693 | <row> | 691 | <row> |
694 | <entry>__u32</entry> | 692 | <entry>__u32</entry> |
695 | <entry><structfield>reserved</structfield></entry> | 693 | <entry><structfield>reserved</structfield></entry> |
696 | <entry></entry> | 694 | <entry></entry> |
697 | <entry>A place holder for future extensions and custom | 695 | <entry>A place holder for future extensions. Applications |
698 | (driver defined) buffer types | ||
699 | <constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications | ||
700 | should set this to 0.</entry> | 696 | should set this to 0.</entry> |
701 | </row> | 697 | </row> |
702 | </tbody> | 698 | </tbody> |
@@ -827,14 +823,7 @@ should set this to 0.</entry> | |||
827 | <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant></entry> | 823 | <entry><constant>V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY</constant></entry> |
828 | <entry>8</entry> | 824 | <entry>8</entry> |
829 | <entry>Buffer for video output overlay (OSD), see <xref | 825 | <entry>Buffer for video output overlay (OSD), see <xref |
830 | linkend="osd" />. Status: <link | 826 | linkend="osd" />.</entry> |
831 | linkend="experimental">Experimental</link>.</entry> | ||
832 | </row> | ||
833 | <row> | ||
834 | <entry><constant>V4L2_BUF_TYPE_PRIVATE</constant></entry> | ||
835 | <entry>0x80</entry> | ||
836 | <entry>This and higher values are reserved for custom | ||
837 | (driver defined) buffer types.</entry> | ||
838 | </row> | 827 | </row> |
839 | </tbody> | 828 | </tbody> |
840 | </tgroup> | 829 | </tgroup> |