diff options
| author | Ezequiel Garcia | 2021-03-04 15:07:52 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2021-03-22 09:50:57 +0100 |
| commit | e74b504a87c110071376438564a6f7a351a215bf (patch) | |
| tree | 9de008cebcc3af21816b90a0c2ed0b0ec76166df /include | |
| parent | 1fb03333eb926e315f9850098b5a3361832f07cb (diff) | |
media: uapi: Move the VP8 stateless control type out of staging
Move the VP8 stateless control types out of staging,
and re-number it to avoid any confusion.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/vp8-ctrls.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/videodev2.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/media/vp8-ctrls.h b/include/media/vp8-ctrls.h index 50c92c5ed0eb..409a87f9e609 100644 --- a/include/media/vp8-ctrls.h +++ b/include/media/vp8-ctrls.h @@ -14,7 +14,6 @@ #include <linux/types.h> #define V4L2_CID_MPEG_VIDEO_VP8_FRAME (V4L2_CID_CODEC_BASE + 2000) -#define V4L2_CTRL_TYPE_VP8_FRAME 0x301 #define V4L2_VP8_SEGMENT_FLAG_ENABLED 0x01 #define V4L2_VP8_SEGMENT_FLAG_UPDATE_MAP 0x02 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index a1d903c6f9f0..611b75df7f17 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1793,6 +1793,8 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205, V4L2_CTRL_TYPE_FWHT_PARAMS = 0x0220, + + V4L2_CTRL_TYPE_VP8_FRAME = 0x0240, }; /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ |