Mercurial > mplayer.hg
changeset 33163:d941d34d5b0f
Add V4L2 support for OpenBSD (and NetBSD).
patch by Brad, brad comstyle com
author | diego |
---|---|
date | Sun, 10 Apr 2011 11:12:45 +0000 |
parents | 7486c14f0087 |
children | dc853608cda3 |
files | configure stream/tvi_v4l2.c |
diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Apr 10 10:58:42 2011 +0000 +++ b/configure Sun Apr 10 11:12:45 2011 +0000 @@ -3709,6 +3709,14 @@ 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 @@ _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_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
--- a/stream/tvi_v4l2.c Sun Apr 10 10:58:42 2011 +0000 +++ b/stream/tvi_v4l2.c Sun Apr 10 11:12:45 2011 +0000 @@ -49,8 +49,12 @@ #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"