diff options
Diffstat (limited to 'include/linux/videodev2.h')
-rw-r--r-- | include/linux/videodev2.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index ce40675324bd..5208b12d5550 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -315,6 +315,7 @@ struct v4l2_pix_format | |||
315 | #define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ | 315 | #define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ |
316 | #define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ | 316 | #define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */ |
317 | #define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ | 317 | #define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */ |
318 | #define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */ | ||
318 | 319 | ||
319 | /* | 320 | /* |
320 | * F O R M A T E N U M E R A T I O N | 321 | * F O R M A T E N U M E R A T I O N |
@@ -548,7 +549,7 @@ struct v4l2_framebuffer | |||
548 | struct v4l2_clip | 549 | struct v4l2_clip |
549 | { | 550 | { |
550 | struct v4l2_rect c; | 551 | struct v4l2_rect c; |
551 | struct v4l2_clip *next; | 552 | struct v4l2_clip __user *next; |
552 | }; | 553 | }; |
553 | 554 | ||
554 | struct v4l2_window | 555 | struct v4l2_window |
@@ -628,6 +629,7 @@ typedef __u64 v4l2_std_id; | |||
628 | #define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) | 629 | #define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) |
629 | #define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) | 630 | #define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) |
630 | #define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) | 631 | #define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) |
632 | #define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000) | ||
631 | 633 | ||
632 | #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) | 634 | #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) |
633 | #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) | 635 | #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) |
@@ -660,7 +662,8 @@ typedef __u64 v4l2_std_id; | |||
660 | V4L2_STD_PAL_H |\ | 662 | V4L2_STD_PAL_H |\ |
661 | V4L2_STD_PAL_I) | 663 | V4L2_STD_PAL_I) |
662 | #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ | 664 | #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ |
663 | V4L2_STD_NTSC_M_JP) | 665 | V4L2_STD_NTSC_M_JP |\ |
666 | V4L2_STD_NTSC_M_KR) | ||
664 | #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ | 667 | #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ |
665 | V4L2_STD_SECAM_K |\ | 668 | V4L2_STD_SECAM_K |\ |
666 | V4L2_STD_SECAM_K1) | 669 | V4L2_STD_SECAM_K1) |