diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:53:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:53:57 -0400 |
| commit | b043b673dc8a73daa233d5d92cf70b32e7351314 (patch) | |
| tree | d17fd0616420886adca7eb1bc19ba7a55a789fa8 /include/linux/videodev2.h | |
| parent | cd5e25d93e6efeb93db7b6731b0a674495270621 (diff) | |
| parent | fb9c280d4c6d4586670e3dfd041d8258db36b330 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (49 commits)
V4L/DVB (3667b): cpia2: fix function prototype
V4L/DVB (3702): Make msp3400 routing defines more consistent
V4L/DVB (3700): Remove obsolete commands from tvp5150.c
V4L/DVB (3697): More msp3400 and bttv fixes
V4L/DVB (3696): Previous change for cx2341X boards broke the remote support
V4L/DVB (3693): Fix msp3400c and bttv stereo/mono/bilingual detection/handling
V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0
V4L/DVB (3689): Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependencies
V4L/DVB (3673): Fix budget-av CAM reset
V4L/DVB (3672): Fix memory leak in dvr open
V4L/DVB (3671): New module parameter 'tv_standard' (dvb-ttpci driver)
V4L/DVB (3670): Fix typo in comment
V4L/DVB (3669): Configurable dma buffer size for saa7146-based budget dvb cards
V4L/DVB (3653h): Move usb v4l docs into Documentation/video4linux
V4L/DVB (3667a): Fix SAP + stereo mode at msp3400
V4L/DVB (3666): Remove trailing newlines
V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers
V4L/DVB (3663): Fix msp3400c wait time and better audio mode fallbacks
V4L/DVB (3662): Don't set msp3400c-non-existent register
V4L/DVB (3661): Add wm8739 stereo audio ADC i2c driver
...
Diffstat (limited to 'include/linux/videodev2.h')
| -rw-r--r-- | include/linux/videodev2.h | 65 |
1 files changed, 8 insertions, 57 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index af2d6155d3fe..d7670ec1ec1e 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -966,66 +966,17 @@ struct v4l2_sliced_vbi_format | |||
| 966 | 966 | ||
| 967 | /* Teletext World System Teletext | 967 | /* Teletext World System Teletext |
| 968 | (WST), defined on ITU-R BT.653-2 */ | 968 | (WST), defined on ITU-R BT.653-2 */ |
| 969 | #define V4L2_SLICED_TELETEXT_PAL_B (0x000001) | 969 | #define V4L2_SLICED_TELETEXT_B (0x0001) |
| 970 | #define V4L2_SLICED_TELETEXT_PAL_C (0x000002) | ||
| 971 | #define V4L2_SLICED_TELETEXT_NTSC_B (0x000010) | ||
| 972 | #define V4L2_SLICED_TELETEXT_SECAM (0x000020) | ||
| 973 | |||
| 974 | /* Teletext North American Broadcast Teletext Specification | ||
| 975 | (NABTS), defined on ITU-R BT.653-2 */ | ||
| 976 | #define V4L2_SLICED_TELETEXT_NTSC_C (0x000040) | ||
| 977 | #define V4L2_SLICED_TELETEXT_NTSC_D (0x000080) | ||
| 978 | |||
| 979 | /* Video Program System, defined on ETS 300 231*/ | 970 | /* Video Program System, defined on ETS 300 231*/ |
| 980 | #define V4L2_SLICED_VPS (0x000400) | 971 | #define V4L2_SLICED_VPS (0x0400) |
| 981 | |||
| 982 | /* Closed Caption, defined on EIA-608 */ | 972 | /* Closed Caption, defined on EIA-608 */ |
| 983 | #define V4L2_SLICED_CAPTION_525 (0x001000) | 973 | #define V4L2_SLICED_CAPTION_525 (0x1000) |
| 984 | #define V4L2_SLICED_CAPTION_625 (0x002000) | ||
| 985 | |||
| 986 | /* Wide Screen System, defined on ITU-R BT1119.1 */ | 974 | /* Wide Screen System, defined on ITU-R BT1119.1 */ |
| 987 | #define V4L2_SLICED_WSS_625 (0x004000) | 975 | #define V4L2_SLICED_WSS_625 (0x4000) |
| 988 | 976 | ||
| 989 | /* Wide Screen System, defined on IEC 61880 */ | 977 | #define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) |
| 990 | #define V4L2_SLICED_WSS_525 (0x008000) | 978 | #define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) |
| 991 | 979 | ||
| 992 | /* Vertical Interval Timecode (VITC), defined on SMPTE 12M */ | ||
| 993 | #define V4l2_SLICED_VITC_625 (0x010000) | ||
| 994 | #define V4l2_SLICED_VITC_525 (0x020000) | ||
| 995 | |||
| 996 | #define V4L2_SLICED_TELETEXT_B (V4L2_SLICED_TELETEXT_PAL_B |\ | ||
| 997 | V4L2_SLICED_TELETEXT_NTSC_B) | ||
| 998 | |||
| 999 | #define V4L2_SLICED_TELETEXT (V4L2_SLICED_TELETEXT_PAL_B |\ | ||
| 1000 | V4L2_SLICED_TELETEXT_PAL_C |\ | ||
| 1001 | V4L2_SLICED_TELETEXT_SECAM |\ | ||
| 1002 | V4L2_SLICED_TELETEXT_NTSC_B |\ | ||
| 1003 | V4L2_SLICED_TELETEXT_NTSC_C |\ | ||
| 1004 | V4L2_SLICED_TELETEXT_NTSC_D) | ||
| 1005 | |||
| 1006 | #define V4L2_SLICED_CAPTION (V4L2_SLICED_CAPTION_525 |\ | ||
| 1007 | V4L2_SLICED_CAPTION_625) | ||
| 1008 | |||
| 1009 | #define V4L2_SLICED_WSS (V4L2_SLICED_WSS_525 |\ | ||
| 1010 | V4L2_SLICED_WSS_625) | ||
| 1011 | |||
| 1012 | #define V4L2_SLICED_VITC (V4L2_SLICED_VITC_525 |\ | ||
| 1013 | V4L2_SLICED_VITC_625) | ||
| 1014 | |||
| 1015 | #define V4L2_SLICED_VBI_525 (V4L2_SLICED_TELETEXT_NTSC_B |\ | ||
| 1016 | V4L2_SLICED_TELETEXT_NTSC_C |\ | ||
| 1017 | V4L2_SLICED_TELETEXT_NTSC_D |\ | ||
| 1018 | V4L2_SLICED_CAPTION_525 |\ | ||
| 1019 | V4L2_SLICED_WSS_525 |\ | ||
| 1020 | V4l2_SLICED_VITC_525) | ||
| 1021 | |||
| 1022 | #define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_PAL_B |\ | ||
| 1023 | V4L2_SLICED_TELETEXT_PAL_C |\ | ||
| 1024 | V4L2_SLICED_TELETEXT_SECAM |\ | ||
| 1025 | V4L2_SLICED_VPS |\ | ||
| 1026 | V4L2_SLICED_CAPTION_625 |\ | ||
| 1027 | V4L2_SLICED_WSS_625 |\ | ||
| 1028 | V4l2_SLICED_VITC_625) | ||
| 1029 | 980 | ||
| 1030 | struct v4l2_sliced_vbi_cap | 981 | struct v4l2_sliced_vbi_cap |
| 1031 | { | 982 | { |