diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2016-08-04 05:01:48 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-08-24 07:37:49 -0400 |
| commit | adca8c8e251fdbdb6b28e3ef7a5ca24b597b82d8 (patch) | |
| tree | 9240c2757e14472224bb163bad329ef68414d459 /include/uapi/linux | |
| parent | 9ddbf68d264a8c2578dcb08d550dd00a273e12fa (diff) | |
[media] videodev2.h: put V4L2_YCBCR_ENC_SYCC under #ifndef __KERNEL__
This define is a duplicate of V4L2_YCBCR_ENC_601. So mark it as
'should not be used' and put it under #ifndef __KERNEL__ to
prevent drivers from referring to it.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/videodev2.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 0ec15222a6ca..5529741202b5 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h | |||
| @@ -292,13 +292,11 @@ enum v4l2_ycbcr_encoding { | |||
| 292 | * various colorspaces: | 292 | * various colorspaces: |
| 293 | * | 293 | * |
| 294 | * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M, | 294 | * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M, |
| 295 | * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_ADOBERGB and | 295 | * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB, |
| 296 | * V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 | 296 | * V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 |
| 297 | * | 297 | * |
| 298 | * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709 | 298 | * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709 |
| 299 | * | 299 | * |
| 300 | * V4L2_COLORSPACE_SRGB: V4L2_YCBCR_ENC_SYCC | ||
| 301 | * | ||
| 302 | * V4L2_COLORSPACE_BT2020: V4L2_YCBCR_ENC_BT2020 | 300 | * V4L2_COLORSPACE_BT2020: V4L2_YCBCR_ENC_BT2020 |
| 303 | * | 301 | * |
| 304 | * V4L2_COLORSPACE_SMPTE240M: V4L2_YCBCR_ENC_SMPTE240M | 302 | * V4L2_COLORSPACE_SMPTE240M: V4L2_YCBCR_ENC_SMPTE240M |
| @@ -317,8 +315,14 @@ enum v4l2_ycbcr_encoding { | |||
| 317 | /* Rec. 709/EN 61966-2-4 Extended Gamut -- HDTV */ | 315 | /* Rec. 709/EN 61966-2-4 Extended Gamut -- HDTV */ |
| 318 | V4L2_YCBCR_ENC_XV709 = 4, | 316 | V4L2_YCBCR_ENC_XV709 = 4, |
| 319 | 317 | ||
| 320 | /* sYCC (Y'CbCr encoding of sRGB) */ | 318 | #ifndef __KERNEL__ |
| 319 | /* | ||
| 320 | * sYCC (Y'CbCr encoding of sRGB), identical to ENC_601. It was added | ||
| 321 | * originally due to a misunderstanding of the sYCC standard. It should | ||
| 322 | * not be used, instead use V4L2_YCBCR_ENC_601. | ||
| 323 | */ | ||
| 321 | V4L2_YCBCR_ENC_SYCC = 5, | 324 | V4L2_YCBCR_ENC_SYCC = 5, |
| 325 | #endif | ||
| 322 | 326 | ||
| 323 | /* BT.2020 Non-constant Luminance Y'CbCr */ | 327 | /* BT.2020 Non-constant Luminance Y'CbCr */ |
| 324 | V4L2_YCBCR_ENC_BT2020 = 6, | 328 | V4L2_YCBCR_ENC_BT2020 = 6, |
