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

merge XFree86 RC2 (4.3.99.902) from vendor branch

Browse Source
This commit is contained in:
Kaleb Keithley
2003-12-20 00:28:29 +00:00
parent f6186e5b91
commit be350fa186
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/v4l.c
View File

@@ -2,7 +2,8 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.32 2003/09/24 02:43:30 dawes Exp $ */
/* $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 $ */
#include "videodev.h"
#include "xf86.h"
@@ -718,11 +719,11 @@ static void
V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
{
static struct video_channel channel;
int i,entries,have_bttv;
int i,entries,have_bttv,bttv_ver;
#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
have_bttv = 0;
if (-1 != ioctl(fd,BTTV_VERSION,NULL))
if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
have_bttv = 1;
entries = (have_bttv ? 7 : 3) * channels;