[media] vivid: don't mention the obsolete sYCC Y'CbCr encoding

This encoding is identical to the 601 encoding. The old duplicate
SYCC define is about to be removed for use in the kernel, so remove
its use in vivid first.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c
index b98089c95ef52ff73d8a8a8ae50329e419fb6f3c..aceb38d9f7e71534c8ec09e2c7ac177caa160520 100644 (file)
--- a/drivers/media/platform/vivid/vivid-ctrls.c
+++ b/drivers/media/platform/vivid/vivid-ctrls.c
@@ -761,7 +761,7 @@ static const char * const vivid_ctrl_ycbcr_enc_strings[] = {
        "Rec. 709",
        "xvYCC 601",
        "xvYCC 709",
-       "sYCC",
+       "",
        "BT.2020",
        "BT.2020 Constant Luminance",
        "SMPTE 240M",
@@ -773,6 +773,7 @@ static const struct v4l2_ctrl_config vivid_ctrl_ycbcr_enc = {
        .id = VIVID_CID_YCBCR_ENC,
        .name = "Y'CbCr Encoding",
        .type = V4L2_CTRL_TYPE_MENU,
+       .menu_skip_mask = 1 << 5,
        .max = ARRAY_SIZE(vivid_ctrl_ycbcr_enc_strings) - 2,
        .qmenu = vivid_ctrl_ycbcr_enc_strings,
 };