media: uapi: Move the MPEG-2 stateless control type out of staging

Move the MPEG-2 stateless control types out of staging,
and re-number it to avoid any confusion.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Jernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net>
Tested-by: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/include/media/mpeg2-ctrls.h b/include/media/mpeg2-ctrls.h
index a84ce088a42e051de0a2fd43d4a5dec0d81360d3..a3d19de9e53abfca109d243ebd8acab0fbbaed07 100644 (file)
--- a/include/media/mpeg2-ctrls.h
+++ b/include/media/mpeg2-ctrls.h
@@ -16,10 +16,6 @@
 #define V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE              (V4L2_CID_CODEC_BASE+253)
 
 /* enum v4l2_ctrl_type type values */
-#define V4L2_CTRL_TYPE_MPEG2_QUANTISATION 0x0131
-#define V4L2_CTRL_TYPE_MPEG2_SEQUENCE 0x0132
-#define V4L2_CTRL_TYPE_MPEG2_PICTURE 0x0133
-
 #define V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE                0x01
 
 /**

diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 311a01cc57752bd1613717c6999b5fcb362d66e9..d3bb18a3a51bdedd345779acdde44620eaa9b0d2 100644 (file)
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1807,6 +1807,10 @@ enum v4l2_ctrl_type {
        V4L2_CTRL_TYPE_FWHT_PARAMS          = 0x0220,
 
        V4L2_CTRL_TYPE_VP8_FRAME            = 0x0240,
+
+       V4L2_CTRL_TYPE_MPEG2_QUANTISATION   = 0x0250,
+       V4L2_CTRL_TYPE_MPEG2_SEQUENCE       = 0x0251,
+       V4L2_CTRL_TYPE_MPEG2_PICTURE        = 0x0252,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */