]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] Docbook: media-types.xml: update the existing tables
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 12 Dec 2015 12:29:30 +0000 (10:29 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 11 Jan 2016 14:19:11 +0000 (12:19 -0200)
There were some changes on the media types that were not reflected
on the types tables. Update them to reflect the upstream changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Documentation/DocBook/media/v4l/media-types.xml

index 0c5c9c034586d32ff468c6f924c58c757b896637..4a6038301e06eb3b27360c47f3123bbee939aae9 100644 (file)
@@ -33,7 +33,7 @@
            <entry>Digital TV demodulator entity.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_F_MPEG_TS_DEMUX</constant></entry>
+           <entry><constant>MEDIA_ENT_F_TS_DEMUX</constant></entry>
            <entry>MPEG Transport stream demux entity. Could be implemented on hardware or in Kernelspace by the Linux DVB subsystem.</entry>
          </row>
          <row>
            <entry>Default entity for its type. Used to discover the default
            audio, VBI and video devices, the default camera sensor, ...</entry>
          </row>
+         <row>
+           <entry><constant>MEDIA_ENT_FL_CONNECTOR</constant></entry>
+           <entry>The entity represents a data conector</entry>
+         </row>
        </tbody>
       </tgroup>
     </table>
            <entry>The link enabled state can be modified during streaming. This
            flag is set by drivers and is read-only for applications.</entry>
          </row>
+         <row>
+           <entry><constant>MEDIA_LNK_FL_LINK_TYPE</constant></entry>
+           <entry><para>This is a bitmask that defines the type of the link.
+                  Currently, two types of links are supported:</para>
+           <para><constant>MEDIA_LNK_FL_DATA_LINK</constant>
+           if the link is between two pads</para>
+           <para><constant>MEDIA_LNK_FL_INTERFACE_LINK</constant>
+           if the link is between an interface and an entity</para></entry>
+         </row>
        </tbody>
       </tgroup>
     </table>