[Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/v4l v4l.c,1.1.4.2,1.1.4.3
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
- Previous message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/trident blade_accel.c,1.1.4.1,1.1.4.2 image_accel.c,1.1.4.1,1.1.4.2 trident_accel.c,1.1.4.1,1.1.4.2 trident_dac.c,1.1.4.1,1.1.4.2 trident_driver.c,1.1.4.1,1.1.4.2 trident_regs.h,1.1.4.1,1.1.4.2 trident_video.c,1.1.4.1,1.1.4.2 xp_accel.c,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/via via_tuner.c,NONE,1.1.1.1.2.1 Imakefile,1.1.4.1,1.1.4.2 via.h,1.1,1.1.4.1 via.man,1.1,1.1.4.1 via_accel.c,1.1.4.1,1.1.4.2 via_bandwidth.c,1.1,1.1.4.1 via_bios.c,1.1.4.1,1.1.4.2 via_bios.h,1.1,1.1.4.1 via_dri.c,1.1,1.1.4.1 via_driver.c,1.1.4.1,1.1.4.2 via_driver.h,1.1.4.1,1.1.4.2 via_i2c.c,1.1,1.1.4.1 via_memory.c,1.1,1.1.4.1 via_mode.h,1.1,1.1.4.1 via_swov.c,1.1.4.1,1.1.4.2 via_utility.c,1.1,1.1.4.1 via_video.c,1.1,1.1.4.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/v4l
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/drivers/v4l
Modified Files:
Tag: XORG-CURRENT
v4l.c
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: v4l.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/v4l.c 20 Dec 2003 00:28:29 -0000 1.1.4.2
+++ b/v4l.c 23 Feb 2004 21:36:27 -0000 1.1.4.3
@@ -2,8 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XdotOrg$ */
-/* $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 @@
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 @@
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;
- Previous message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/trident blade_accel.c,1.1.4.1,1.1.4.2 image_accel.c,1.1.4.1,1.1.4.2 trident_accel.c,1.1.4.1,1.1.4.2 trident_dac.c,1.1.4.1,1.1.4.2 trident_driver.c,1.1.4.1,1.1.4.2 trident_regs.h,1.1.4.1,1.1.4.2 trident_video.c,1.1.4.1,1.1.4.2 xp_accel.c,1.1.4.1,1.1.4.2
- Next message: [Xorg-commit] xc/programs/Xserver/hw/xfree86/drivers/via via_tuner.c,NONE,1.1.1.1.2.1 Imakefile,1.1.4.1,1.1.4.2 via.h,1.1,1.1.4.1 via.man,1.1,1.1.4.1 via_accel.c,1.1.4.1,1.1.4.2 via_bandwidth.c,1.1,1.1.4.1 via_bios.c,1.1.4.1,1.1.4.2 via_bios.h,1.1,1.1.4.1 via_dri.c,1.1,1.1.4.1 via_driver.c,1.1.4.1,1.1.4.2 via_driver.h,1.1.4.1,1.1.4.2 via_i2c.c,1.1,1.1.4.1 via_memory.c,1.1,1.1.4.1 via_mode.h,1.1,1.1.4.1 via_swov.c,1.1.4.1,1.1.4.2 via_utility.c,1.1,1.1.4.1 via_video.c,1.1,1.1.4.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list