[FFmpeg-cvslog] r15376 - in trunk: configure libavdevice/v4l2.c

diego subversion
Mon Sep 22 00:47:53 CEST 2008


Author: diego
Date: Mon Sep 22 00:47:52 2008
New Revision: 15376

Log:
V4L2 support for OpenBSD, patch by Brad, brad comstyle com


Modified:
   trunk/configure
   trunk/libavdevice/v4l2.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Sep 22 00:47:52 2008
@@ -786,6 +786,7 @@ HAVE_LIST="
     sys_resource_h
     sys_select_h
     sys_soundcard_h
+    sys_videoio_h
     termios_h
     threads
     winsock2_h
@@ -904,7 +905,7 @@ rtp_muxer_deps="network rtp_protocol"
 rtsp_demuxer_deps="sdp_demuxer"
 sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
 v4l_demuxer_deps="linux_videodev_h"
-v4l2_demuxer_deps="linux_videodev2_h"
+v4l2_demuxer_deps_any="linux_videodev2_h sys_videoio_h"
 vfwcap_demuxer_deps="capCreateCaptureWindow"
 vfwcap_demuxer_extralibs="-lvfw32"
 x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
@@ -1817,6 +1818,7 @@ EOF
 
 check_header linux/videodev.h
 check_header linux/videodev2.h
+check_header sys/videoio.h
 
 check_func_headers "windows.h vfw.h" capCreateCaptureWindow -lvfw32
 

Modified: trunk/libavdevice/v4l2.c
==============================================================================
--- trunk/libavdevice/v4l2.c	(original)
+++ trunk/libavdevice/v4l2.c	Mon Sep 22 00:47:52 2008
@@ -35,8 +35,12 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_VIDEOIO_H
+#include <sys/videoio.h>
+#else
 #include <asm/types.h>
 #include <linux/videodev2.h>
+#endif
 #include <time.h>
 #include <strings.h>
 




More information about the ffmpeg-cvslog mailing list