diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /Documentation/video4linux | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'Documentation/video4linux')
| -rw-r--r-- | Documentation/video4linux/API.html | 2 | ||||
| -rw-r--r-- | Documentation/video4linux/bttv/CARDS | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html index 5b3780cc3..1af60ed4e 100644 --- a/Documentation/video4linux/API.html +++ b/Documentation/video4linux/API.html @@ -314,7 +314,7 @@ A second way to handle image capture is via the mmap interface if supported. To use the mmap interface a user first sets the desired image size and depth properties. Next the VIDIOCGMBUF ioctl is issued. This reports the size of buffer to mmap and the offset within the buffer for each frame. The -number of frames supported is device dependant and may only be one. +number of frames supported is device dependent and may only be one. <P> The video_mbuf structure contains the following fields <P> diff --git a/Documentation/video4linux/bttv/CARDS b/Documentation/video4linux/bttv/CARDS index 0cfd4d72e..cd66ee3c5 100644 --- a/Documentation/video4linux/bttv/CARDS +++ b/Documentation/video4linux/bttv/CARDS @@ -90,15 +90,14 @@ e.g.: AverMedia --------- - ... +ADS Channel Surfer +------------------ +... - - - - - - +Maxi TV Video PCI 2 card +------------------------ +... |