summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-26 22:17:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-26 22:17:48 -0300
commit09aaab39357cabdaf8446e398d8eea2aee045d11 (patch)
treeadebb16a1d12259e0a335fd60443f56a4e6dda67 /linux/Documentation
parent885a23d5d3b31b99d23ef1d05b212d9e3fbba93f (diff)
parent355b49a5385160b8c9a02ba6ef84f6dfaa9e74b9 (diff)
downloadmediapointer-dvb-s2-09aaab39357cabdaf8446e398d8eea2aee045d11.tar.gz
mediapointer-dvb-s2-09aaab39357cabdaf8446e398d8eea2aee045d11.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/gspca.txt1
-rw-r--r--linux/Documentation/video4linux/v4lgrab.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/gspca.txt b/linux/Documentation/video4linux/gspca.txt
index 12c8ff705..98529e03a 100644
--- a/linux/Documentation/video4linux/gspca.txt
+++ b/linux/Documentation/video4linux/gspca.txt
@@ -282,6 +282,7 @@ spca561 10fd:7e50 FlyCam Usb 100
zc3xx 10fd:8050 Typhoon Webshot II USB 300k
ov534 1415:2000 Sony HD Eye for PS3 (SLEH 00201)
pac207 145f:013a Trust WB-1300N
+vc032x 15b8:6001 HP 2.0 Megapixel
vc032x 15b8:6002 HP 2.0 Megapixel rz406aa
spca501 1776:501c Arowana 300K CMOS Camera
t613 17a1:0128 TASCORP JPEG Webcam, NGS Cyclops
diff --git a/linux/Documentation/video4linux/v4lgrab.c b/linux/Documentation/video4linux/v4lgrab.c
index d6e70bef8..05769cff1 100644
--- a/linux/Documentation/video4linux/v4lgrab.c
+++ b/linux/Documentation/video4linux/v4lgrab.c
@@ -105,8 +105,8 @@ int main(int argc, char ** argv)
struct video_picture vpic;
unsigned char *buffer, *src;
- int bpp = 24, r, g, b;
- unsigned int i, src_depth;
+ int bpp = 24, r = 0, g = 0, b = 0;
+ unsigned int i, src_depth = 16;
if (fd < 0) {
perror(VIDEO_DEV);