| Message ID | 20210302205405.69538-6-ezequiel@collabora.com |
|---|---|
| State | Accepted |
| Commit | e74b504a87c110071376438564a6f7a351a215bf |
| Headers | show |
| Series | V4L2 stateless VP8 de-staging | expand |
diff --git a/include/media/vp8-ctrls.h b/include/media/vp8-ctrls.h index 1a5a3d8ab444..051700f33863 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 */
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> --- include/media/vp8-ctrls.h | 1 - include/uapi/linux/videodev2.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)