diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-12 10:29:30 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 12:19:11 -0200 |
| commit | eb7d970aa0ab9964fe3200df4daf76c37d35f076 (patch) | |
| tree | 6ea9a0eb7c6dfbdcb6623b89ce9e5c649cd2a591 /Documentation/DocBook/media | |
| parent | 5fec921f49891e1343d60df3f6f40ceb52acdd42 (diff) | |
[media] Docbook: media-types.xml: update the existing tables
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>
Diffstat (limited to 'Documentation/DocBook/media')
| -rw-r--r-- | Documentation/DocBook/media/v4l/media-types.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml index 0c5c9c034586..4a6038301e06 100644 --- a/Documentation/DocBook/media/v4l/media-types.xml +++ b/Documentation/DocBook/media/v4l/media-types.xml @@ -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> @@ -101,6 +101,10 @@ <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> @@ -159,6 +163,15 @@ <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> |