From b9285bfc7f401becf25532d035ad4c98982c742c Mon Sep 17 00:00:00 2001 From: Manjunath Hadli Date: Thu, 7 Feb 2013 13:48:51 -0300 Subject: [PATCH] --- yaml --- r: 366648 b: refs/heads/master c: e64171b97b88a1adf297d429826fdbb9e232ab53 h: refs/heads/master v: v3 --- [refs] | 2 +- .../DocBook/media/v4l/media-ioc-enum-entities.xml | 10 ++++++++++ trunk/include/uapi/linux/media.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5d4cef4e0099..12e8b1c4f052 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88da0183eb2b72048099b4e0ecae1705f5309c94 +refs/heads/master: e64171b97b88a1adf297d429826fdbb9e232ab53 diff --git a/trunk/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/trunk/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml index 576b68b33f2c..116c301656e0 100644 --- a/trunk/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml +++ b/trunk/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml @@ -272,6 +272,16 @@ MEDIA_ENT_T_V4L2_SUBDEV_LENS Lens controller + + MEDIA_ENT_T_V4L2_SUBDEV_DECODER + 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. + diff --git a/trunk/include/uapi/linux/media.h b/trunk/include/uapi/linux/media.h index 0ef883327de2..ed49574ad757 100644 --- a/trunk/include/uapi/linux/media.h +++ b/trunk/include/uapi/linux/media.h @@ -56,6 +56,8 @@ struct media_device_info { #define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR (MEDIA_ENT_T_V4L2_SUBDEV + 1) #define MEDIA_ENT_T_V4L2_SUBDEV_FLASH (MEDIA_ENT_T_V4L2_SUBDEV + 2) #define MEDIA_ENT_T_V4L2_SUBDEV_LENS (MEDIA_ENT_T_V4L2_SUBDEV + 3) +/* A converter of analogue video to its digital representation. */ +#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER (MEDIA_ENT_T_V4L2_SUBDEV + 4) #define MEDIA_ENT_FL_DEFAULT (1 << 0)