diff options
| author | Ezequiel Garcia <ezequiel@collabora.com> | 2020-11-26 12:36:15 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-12-03 14:27:33 +0300 |
| commit | a7ead39700e10df7aaadc13c72e3a0cefcbb7f4e (patch) | |
| tree | 6f7d670d968c12e4096788642ab9110fd7b52810 /include/media | |
| parent | ee6fcc67db54f699c1ab53a3939fcf62d7cfb311 (diff) | |
| download | linux-a7ead39700e10df7aaadc13c72e3a0cefcbb7f4e.tar.xz | |
media: uapi: Move the H264 stateless control types out of staging
Move the H264 stateless control types out of staging,
and re-number them to avoid any confusion.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/h264-ctrls.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h index d98c5b885379..c15fed956bf5 100644 --- a/include/media/h264-ctrls.h +++ b/include/media/h264-ctrls.h @@ -35,14 +35,6 @@ #define V4L2_CID_MPEG_VIDEO_H264_START_CODE (V4L2_CID_CODEC_BASE+1006) #define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS (V4L2_CID_CODEC_BASE+1007) -/* enum v4l2_ctrl_type type values */ -#define V4L2_CTRL_TYPE_H264_SPS 0x0110 -#define V4L2_CTRL_TYPE_H264_PPS 0x0111 -#define V4L2_CTRL_TYPE_H264_SCALING_MATRIX 0x0112 -#define V4L2_CTRL_TYPE_H264_SLICE_PARAMS 0x0113 -#define V4L2_CTRL_TYPE_H264_DECODE_PARAMS 0x0114 -#define V4L2_CTRL_TYPE_H264_PRED_WEIGHTS 0x0115 - /** * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode * |