diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:31:06 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:31:06 +0000 |
| commit | 3a688dcc664da0cf9583f653eca14d2a98ed5708 (patch) | |
| tree | bae893bd92f310c1c2294b4dbe03e18ca1b71d33 | |
| parent | f6186e5b9100844bc9bcf6f1dbf044037239ce58 (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | man/v4l.man | 2 | ||||
| -rw-r--r-- | src/v4l.c | 20 | ||||
| -rw-r--r-- | src/videodev.h | 2 |
4 files changed, 13 insertions, 13 deletions
@@ -34,4 +34,4 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $ diff --git a/man/v4l.man b/man/v4l.man index 5337112..38014b7 100644 --- a/man/v4l.man +++ b/man/v4l.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH V4L __drivermansuffix__ __vendorversion__ @@ -2,7 +2,7 @@ * video4linux Xv Driver * based on Michael Schimek's permedia 2 driver. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.32 2003/09/24 02:43:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */ #include "videodev.h" #include "xf86.h" @@ -718,11 +718,11 @@ static void V4LBuildEncodings(PortPrivPtr p, int fd, int channels) { static struct video_channel channel; - int i,entries,have_bttv; + int i,entries,have_bttv,bttv_ver; #define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int) have_bttv = 0; - if (-1 != ioctl(fd,BTTV_VERSION,NULL)) + if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver)) have_bttv = 1; entries = (have_bttv ? 7 : 3) * channels; @@ -747,17 +747,17 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels) continue; } - v4l_add_enc(p->enc, p->nenc,"pal", channel.name, 768,576, 1,50); + v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50); p->norm[p->nenc] = VIDEO_MODE_PAL; p->input[p->nenc] = i; p->nenc++; - v4l_add_enc(p->enc,p->nenc,"ntsc", channel.name, 640,480, 1001,60000); + v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000); p->norm[p->nenc] = VIDEO_MODE_NTSC; p->input[p->nenc] = i; p->nenc++; - v4l_add_enc(p->enc,p->nenc,"secam",channel.name, 768,576, 1,50); + v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50); p->norm[p->nenc] = VIDEO_MODE_SECAM; p->input[p->nenc] = i; p->nenc++; @@ -767,28 +767,28 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels) ntsc and secam. But there are a few more norms (pal versions with a different timings used in south america for example). The bttv driver can handle these too. */ - if (0 != v4l_add_enc(p->enc,p->nenc,"palnc",channel.name, + if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name, 640, 576, 1,50)) goto fail; p->norm[p->nenc] = 3; p->input[p->nenc] = i; p->nenc++; - if (0 != v4l_add_enc(p->enc,p->nenc,"palm",channel.name, + if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name, 640, 576, 1,50)) goto fail; p->norm[p->nenc] = 4; p->input[p->nenc] = i; p->nenc++; - if (0 != v4l_add_enc(p->enc, p->nenc,"paln", channel.name, + if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name, 768,576, 1,50)) goto fail; p->norm[p->nenc] = 5; p->input[p->nenc] = i; p->nenc++; - if (0 != v4l_add_enc(p->enc,p->nenc,"ntscjp", channel.name, + if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name, 640,480, 1001,60000)) goto fail; p->norm[p->nenc] = 6; diff --git a/src/videodev.h b/src/videodev.h index 77b592e..1d6991e 100644 --- a/src/videodev.h +++ b/src/videodev.h @@ -7,7 +7,7 @@ * Used here with the explicit permission of the original author, Alan Cox. * <alan@lxorguk.ukuu.org.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.8 2001/03/03 22:46:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */ #include "Xmd.h" |