[Mplayer-cvslog] CVS: main/libmpdemux tvi_v4l.c,1.69,1.70

Alex Beregszaszi alex at mplayerhq.hu
Tue Jan 20 14:32:07 CET 2004


Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/scsi/2/tmp/cvs-serv12099

Modified Files:
	tvi_v4l.c 
Log Message:
compile fix when v4l2 is present but disabled

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- tvi_v4l.c	11 Jan 2004 17:07:32 -0000	1.69
+++ tvi_v4l.c	20 Jan 2004 13:32:05 -0000	1.70
@@ -410,7 +410,7 @@
     }
 }
 
-#ifndef __LINUX_VIDEODEV2_H
+#if !defined(__LINUX_VIDEODEV2_H) && !defined(VIDIOC_QUERYCAP)
 struct v4l2_capability
 {
         __u8    driver[16];     /* i.e. "bttv" */




More information about the MPlayer-cvslog mailing list