diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:52:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:52:24 +0000 |
| commit | 1f8ceb0991d6154eb5993cf2eb8b2d9a68a8eaf9 (patch) | |
| tree | 83c6c7fbd0d115cb4c033303b9c90da575e89dc3 | |
| parent | fb4a148b6ea5f839f418a8dc7ab0f44bd90678d1 (diff) | |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | man/v4l.man | 10 | ||||
| -rw-r--r-- | src/v4l.c | 4 | ||||
| -rw-r--r-- | src/videodev.h | 2 |
4 files changed, 9 insertions, 9 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..ab2f844 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__ @@ -13,9 +13,9 @@ v4l \- video4linux driver .fi .SH DESCRIPTION .B v4l -is an XFree86 driver for video4linux cards. It provides a Xvideo +is an __xservername__ driver for video4linux cards. It provides a Xvideo extention port for video overlay. Just add the driver to the module -list within the module section of your XF86Config file if you want +list within the module section of your __xconfigfile__ file if you want to use it. There are no config options. .P Note that the the extmod module is also required for the Xvideo @@ -30,10 +30,10 @@ overlay. bt848/bt878-based TV cards are the most popular hardware these days. .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHORS Authors include: Gerd Knorr <kraxel@bytesex.org> @@ -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.34 2003/12/31 06:08:53 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" @@ -50,7 +50,7 @@ static XF86ModuleVersionInfo v4lVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 0, 0, 1, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, 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" |