From: Hans Verkuil Date: Thu, 29 Jan 2015 11:22:37 +0000 (-0300) Subject: [media] vivid: use consistent colorspace/Y'CbCr Encoding strings X-Git-Tag: v4.0-rc1~130^2~110 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eb79dbf6c2b4d091bc358074ff39795e4054db5c;p=karo-tx-linux.git [media] vivid: use consistent colorspace/Y'CbCr Encoding strings Keep the colorspace and encoding names consistent with what is used elsewhere (primarily the utilities in v4l-utils.git). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c index 857e7866e8bc..32a798f2d953 100644 --- a/drivers/media/platform/vivid/vivid-ctrls.c +++ b/drivers/media/platform/vivid/vivid-ctrls.c @@ -689,7 +689,7 @@ static const struct v4l2_ctrl_config vivid_ctrl_max_edid_blocks = { static const char * const vivid_ctrl_colorspace_strings[] = { "SMPTE 170M", - "REC 709", + "Rec. 709", "sRGB", "AdobeRGB", "BT.2020", @@ -716,7 +716,7 @@ static const char * const vivid_ctrl_ycbcr_enc_strings[] = { "xvYCC 601", "xvYCC 709", "sYCC", - "BT.2020 Non-Constant Luminance", + "BT.2020", "BT.2020 Constant Luminance", "SMPTE 240M", NULL,