XLibre/xf86-video-v4l
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-v4l.git synced 2026-03-24 01:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004

Browse Source
This commit is contained in:
Egbert Eich
2004-01-29 08:08:41 +00:00
parent e8bf6a26c8
commit 871d6d6aef
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/v4l.c
View File

@@ -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.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"
@@ -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;