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

Merging XORG-CURRENT into trunk

Browse Source
This commit is contained in:
Egbert Eich
2004-04-23 19:52:24 +00:00
parent fb4a148b6e
commit 1f8ceb0991
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@@ -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 $

10
man/v4l.man
View File

@@ -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>

4
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.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,

2
src/videodev.h
View File

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