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
5050 #ifndef __LINUX_V4L2_CONTROLS_H
5151 #define __LINUX_V4L2_CONTROLS_H
5252
53+#include <linux/types.h>
54+
5355 /* Control classes */
5456 #define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
5557 #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
@@ -1110,6 +1112,7 @@ struct v4l2_mpeg2_sequence { · 1054 unmodified lines
11101112 __u8 profile_and_level_indication;
11111113 __u8 progressive_sequence;
11121114 __u8 chroma_format;
1115+ __u8 pad;
11131116 };
11141117
11151118 struct v4l2_mpeg2_picture {
@@ -1128,6 +1131,7 @@ struct v4l2_mpeg2_picture { · 12 unmodified lines
11281131 __u8 alternate_scan;
11291132 __u8 repeat_first_field;
11301133 __u8 progressive_frame;
1134+ __u8 pad;
11311135 };
11321136
11331137 struct v4l2_ctrl_mpeg2_slice_params {
@@ -1142,6 +1146,7 @@ struct v4l2_ctrl_mpeg2_slice_params { · 8 unmodified lines
11421146
11431147 __u8 backward_ref_index;
11441148 __u8 forward_ref_index;
1149+ __u8 pad;
11451150 };
11461151
11471152 struct v4l2_ctrl_mpeg2_quantization {