Commit 2f096882 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

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: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Tested-by: default avatarDaniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 45f97ba1

include/media/mpeg2-ctrls.h

+0 −4
Original line number Diff line number Diff line
@@ -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



/**

include/uapi/linux/videodev2.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */