aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2017-04-10 10:01:36 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2017-04-10 10:01:36 +0200
commit9f4ce80524ad9b43453cab3c1e32e3b34c6147fb (patch)
tree6f7aafbc4a77afc41db588831af06308c3a1b151 /include
parent08572e7db2120bc45db732d02409dfd3346b8e51 (diff)
v4l-utils: sync with kernel
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cec.h2
-rw-r--r--include/linux/videodev2.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/cec.h b/include/linux/cec.h
index 14b6f24b..a0dfe27b 100644
--- a/include/linux/cec.h
+++ b/include/linux/cec.h
@@ -223,7 +223,7 @@ static inline int cec_msg_status_is_ok(const struct cec_msg *msg)
#define CEC_LOG_ADDR_BACKUP_2 13
#define CEC_LOG_ADDR_SPECIFIC 14
#define CEC_LOG_ADDR_UNREGISTERED 15 /* as initiator address */
-#define CEC_LOG_ADDR_BROADCAST 15 /* ad destination address */
+#define CEC_LOG_ADDR_BROADCAST 15 /* as destination address */
/* The logical address types that the CEC device wants to claim */
#define CEC_LOG_ADDR_TYPE_TV 0
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 33dc6dbf..7266a625 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -374,8 +374,7 @@ enum v4l2_quantization {
#define V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb_or_hsv, colsp, ycbcr_enc) \
(((is_rgb_or_hsv) && (colsp) == V4L2_COLORSPACE_BT2020) ? \
V4L2_QUANTIZATION_LIM_RANGE : \
- (((is_rgb_or_hsv) || (ycbcr_enc) == V4L2_YCBCR_ENC_XV601 || \
- (ycbcr_enc) == V4L2_YCBCR_ENC_XV709 || (colsp) == V4L2_COLORSPACE_JPEG) ? \
+ (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \
V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE))
enum v4l2_priority {

Privacy Policy