aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2018-11-06 14:37:30 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2018-11-06 14:37:30 +0100
commit74e0cf9367e930cb5358ac701590be65f40c9033 (patch)
tree9a26fda88e69cbe49b250c34166be3af25f064b6 /include
parent0aa28f4293ee3306b34ea2866ef5f26fa75d2ed0 (diff)
v4l-utils: sync-with-kernel
Sync to the latest media_tree master branch. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'include')
-rw-r--r--include/linux/v4l2-controls.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h
index 86a54916..998983a6 100644
--- a/include/linux/v4l2-controls.h
+++ b/include/linux/v4l2-controls.h
@@ -47,11 +47,11 @@
* videodev2.h.
*/
-#include <linux/types.h>
-
#ifndef __LINUX_V4L2_CONTROLS_H
#define __LINUX_V4L2_CONTROLS_H
+#include <linux/types.h>
+
/* Control classes */
#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
@@ -1112,6 +1112,7 @@ struct v4l2_mpeg2_sequence {
__u8 profile_and_level_indication;
__u8 progressive_sequence;
__u8 chroma_format;
+ __u8 pad;
};
struct v4l2_mpeg2_picture {
@@ -1130,6 +1131,7 @@ struct v4l2_mpeg2_picture {
__u8 alternate_scan;
__u8 repeat_first_field;
__u8 progressive_frame;
+ __u8 pad;
};
struct v4l2_ctrl_mpeg2_slice_params {
@@ -1144,6 +1146,7 @@ struct v4l2_ctrl_mpeg2_slice_params {
__u8 backward_ref_index;
__u8 forward_ref_index;
+ __u8 pad;
};
struct v4l2_ctrl_mpeg2_quantization {

Privacy Policy