diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:36:27 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:36:27 +0000 |
| commit | 11fe587203112188c45a17a2f724fc202a0c9493 (patch) | |
| tree | c36002a20a548700fccc901705250dcc93712388 | |
| parent | be350fa18601e57fe2ac589565fe22e919f4df71 (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
| -rw-r--r-- | src/v4l.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -2,8 +2,7 @@ * video4linux Xv Driver * based on Michael Schimek's permedia 2 driver. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.34 2003/12/31 06:08:53 dawes Exp $ */ #include "videodev.h" #include "xf86.h" @@ -748,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++; @@ -768,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; |