diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-05-28 12:01:07 +0200 |
commit | 6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch) | |
tree | c250644c5adce04947d664318996de16df3f02da /Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml | |
parent | b96516220870d8571fc12da980668687c122976e (diff) | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml index 576b68b33f2c..116c301656e0 100644 --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml @@ -272,6 +272,16 @@ <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_LENS</constant></entry> <entry>Lens controller</entry> </row> + <row> + <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_DECODER</constant></entry> + <entry>Video decoder, the basic function of the video decoder is to + accept analogue video from a wide variety of sources such as + broadcast, DVD players, cameras and video cassette recorders, in + either NTSC, PAL or HD format and still occasionally SECAM, separate + it into its component parts, luminance and chrominance, and output + it in some digital video standard, with appropriate embedded timing + signals.</entry> + </row> </tbody> </tgroup> </table> |