History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 7 years ago

Commit b1bf78b2 parents aea0a89 d146194197 files · +1786 −741Browse files

Showing the changes to include/uapi/linux (1 of 197 files). Show all

Unified · Split

include/uapi/linux/v4l2-controls.h+5−0
@@ -50,6 +50,8 @@ · 49 unmodified lines
50#ifndef __LINUX_V4L2_CONTROLS_H50#ifndef __LINUX_V4L2_CONTROLS_H
51#define __LINUX_V4L2_CONTROLS_H51#define __LINUX_V4L2_CONTROLS_H
52 52
53#include <linux/types.h>
54
53/* Control classes */55/* Control classes */
54#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */56#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
55#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */57#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
@@ -1110,6 +1112,7 @@ struct v4l2_mpeg2_sequence { · 1054 unmodified lines
1110 __u8 profile_and_level_indication;1112 __u8 profile_and_level_indication;
1111 __u8 progressive_sequence;1113 __u8 progressive_sequence;
1112 __u8 chroma_format;1114 __u8 chroma_format;
1115 __u8 pad;
1113};1116};
1114 1117
1115struct v4l2_mpeg2_picture {1118struct v4l2_mpeg2_picture {
@@ -1128,6 +1131,7 @@ struct v4l2_mpeg2_picture { · 12 unmodified lines
1128 __u8 alternate_scan;1131 __u8 alternate_scan;
1129 __u8 repeat_first_field;1132 __u8 repeat_first_field;
1130 __u8 progressive_frame;1133 __u8 progressive_frame;
1134 __u8 pad;
1131};1135};
1132 1136
1133struct v4l2_ctrl_mpeg2_slice_params {1137struct v4l2_ctrl_mpeg2_slice_params {
@@ -1142,6 +1146,7 @@ struct v4l2_ctrl_mpeg2_slice_params { · 8 unmodified lines
1142 1146
1143 __u8 backward_ref_index;1147 __u8 backward_ref_index;
1144 __u8 forward_ref_index;1148 __u8 forward_ref_index;
1149 __u8 pad;
1145};1150};
1146 1151
1147struct v4l2_ctrl_mpeg2_quantization {1152struct v4l2_ctrl_mpeg2_quantization {