diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:29 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:29 +0000 |
| commit | be350fa18601e57fe2ac589565fe22e919f4df71 (patch) | |
| tree | 6cb24cf685647e82b12901a55fb6be2ee4d3e9cc | |
| parent | f6186e5b9100844bc9bcf6f1dbf044037239ce58 (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
| -rw-r--r-- | src/v4l.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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; |