Merge branch 'kcsan.2021.05.18a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / include / media / v4l2-ctrls.h

diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index a5953b8..575b59f 100644 (file)
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -17,7 +17,6 @@
  * Include the stateless codec compound control definitions.
  * This will move to the public headers once this API is fully stable.
  */
-#include <media/mpeg2-ctrls.h>
 #include <media/hevc-ctrls.h>
 
 /* forward references */
@@ -40,8 +39,9 @@ struct video_device;
  * @p_u16:                     Pointer to a 16-bit unsigned value.
  * @p_u32:                     Pointer to a 32-bit unsigned value.
  * @p_char:                    Pointer to a string.
- * @p_mpeg2_slice_params:      Pointer to a MPEG2 slice parameters structure.
- * @p_mpeg2_quantization:      Pointer to a MPEG2 quantization data structure.
+ * @p_mpeg2_sequence:          Pointer to a MPEG2 sequence structure.
+ * @p_mpeg2_picture:           Pointer to a MPEG2 picture structure.
+ * @p_mpeg2_quantisation:      Pointer to a MPEG2 quantisation data structure.
  * @p_fwht_params:             Pointer to a FWHT stateless parameters structure.
  * @p_h264_sps:                        Pointer to a struct v4l2_ctrl_h264_sps.
  * @p_h264_pps:                        Pointer to a struct v4l2_ctrl_h264_pps.
@@ -66,8 +66,9 @@ union v4l2_ctrl_ptr {
        u16 *p_u16;
        u32 *p_u32;
        char *p_char;
-       struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;
-       struct v4l2_ctrl_mpeg2_quantization *p_mpeg2_quantization;
+       struct v4l2_ctrl_mpeg2_sequence *p_mpeg2_sequence;
+       struct v4l2_ctrl_mpeg2_picture *p_mpeg2_picture;
+       struct v4l2_ctrl_mpeg2_quantisation *p_mpeg2_quantisation;
        struct v4l2_ctrl_fwht_params *p_fwht_params;
        struct v4l2_ctrl_h264_sps *p_h264_sps;
        struct v4l2_ctrl_h264_pps *p_h264_pps;