diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
| commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
| tree | 63429c2222a55509dc81269233bbe7a321bb86ed /include/linux | |
| parent | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (diff) | |
| parent | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/videodev2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 6f6c69777648..b23be44cbea8 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -629,6 +629,7 @@ typedef __u64 v4l2_std_id; | |||
| 629 | #define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) | 629 | #define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000) |
| 630 | #define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) | 630 | #define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000) |
| 631 | #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) | ||
| 632 | 633 | ||
| 633 | #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) | 634 | #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000) |
| 634 | #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) | 635 | #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000) |
| @@ -661,7 +662,8 @@ typedef __u64 v4l2_std_id; | |||
| 661 | V4L2_STD_PAL_H |\ | 662 | V4L2_STD_PAL_H |\ |
| 662 | V4L2_STD_PAL_I) | 663 | V4L2_STD_PAL_I) |
| 663 | #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ | 664 | #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ |
| 664 | V4L2_STD_NTSC_M_JP) | 665 | V4L2_STD_NTSC_M_JP |\ |
| 666 | V4L2_STD_NTSC_M_KR) | ||
| 665 | #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ | 667 | #define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ |
| 666 | V4L2_STD_SECAM_K |\ | 668 | V4L2_STD_SECAM_K |\ |
| 667 | V4L2_STD_SECAM_K1) | 669 | V4L2_STD_SECAM_K1) |