Move the H264 stateless control types out of staging, and re-number them to avoid any confusion.
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -1780,6 +1780,13 @@ enum v4l2_ctrl_type { · 1779 unmodified lines | |||
| 1780 | V4L2_CTRL_TYPE_U16 = 0x0101, | 1780 | V4L2_CTRL_TYPE_U16 = 0x0101, |
| 1781 | V4L2_CTRL_TYPE_U32 = 0x0102, | 1781 | V4L2_CTRL_TYPE_U32 = 0x0102, |
| 1782 | V4L2_CTRL_TYPE_AREA = 0x0106, | 1782 | V4L2_CTRL_TYPE_AREA = 0x0106, |
| 1783 | |||
| 1784 | V4L2_CTRL_TYPE_H264_SPS = 0x0200, | ||
| 1785 | V4L2_CTRL_TYPE_H264_PPS = 0x0201, | ||
| 1786 | V4L2_CTRL_TYPE_H264_SCALING_MATRIX = 0x0202, | ||
| 1787 | V4L2_CTRL_TYPE_H264_SLICE_PARAMS = 0x0203, | ||
| 1788 | V4L2_CTRL_TYPE_H264_DECODE_PARAMS = 0x0204, | ||
| 1789 | V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205, | ||
| 1783 | }; | 1790 | }; |
| 1784 | 1791 | ||
| 1785 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ | 1792 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ |