[MPlayer-cvslog] r33250 - in trunk: configure stream/tvi_v4l2.c

[diego]

Author: diego
Date: Sun Apr 10 13:12:45 2011
New Revision: 33250

Log:
Add V4L2 support for OpenBSD (and NetBSD).

patch by Brad, brad comstyle com

Modified:
   trunk/configure
   trunk/stream/tvi_v4l2.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Apr 10 12:58:42 2011	(r33249)
+++ trunk/configure	Sun Apr 10 13:12:45 2011	(r33250)
@@ -3709,6 +3709,14 @@ fi
 echores "$_soundcard_h"
 
 
+echocheck "sys/videoio.h"
+sys_videoio_h=no
+def_sys_videoio_h='#undef HAVE_SYS_VIDEOIO_H'
+header_check sys/videoio.h && sys_videoio_h=yes &&
+    def_sys_videoio_h='#define HAVE_SYS_VIDEOIO_H 1'
+echores "$sys_videoio_h"
+
+
 echocheck "sys/dvdio.h"
 _dvdio=no
 # FreeBSD 8.1 has broken dvdio.h
@@ -7385,6 +7393,8 @@ if test "$_tv_v4l2" = auto ; then
   _tv_v4l2=no
   if test "$_tv" = yes && linux ; then
     header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes
+  elif test "$_tv" = yes && sys_videoio_h=yes ; then
+    _tv_v4l2=yes
   fi
 fi
 if test "$_tv_v4l2" = yes ; then
@@ -8310,6 +8320,7 @@ $def_soundcard_h
 $def_sys_asoundlib_h
 $def_sys_soundcard_h
 $def_sys_sysinfo_h
+$def_sys_videoio_h
 $def_termios_h
 $def_termios_sys_h
 $def_winsock2_h

Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c	Sun Apr 10 12:58:42 2011	(r33249)
+++ trunk/stream/tvi_v4l2.c	Sun Apr 10 13:12:45 2011	(r33250)
@@ -49,8 +49,12 @@ known issues:
 #ifdef HAVE_SYS_SYSINFO_H
 #include <sys/sysinfo.h>
 #endif
+#ifdef HAVE_SYS_VIDEOIO_H
+#include <sys/videoio.h>
+#else
 #include <linux/types.h>
 #include <linux/videodev2.h>
+#endif
 #include "mp_msg.h"
 #include "libmpcodecs/img_format.h"
 #include "libmpcodecs/dec_teletext.h"