diff options
| author | Brad <brad@comstyle.com> | 2008-09-21 22:47:52 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-09-21 22:47:52 +0000 |
| commit | 1b6e8b734c61260c5202affafae4781627ad136f (patch) | |
| tree | 2ac8cf95853d956dfb59b7d4249a93567c7c12a8 | |
| parent | 8b1fd554e1c202d96094f9028d7a3a099a063afa (diff) | |
| download | ffmpeg-1b6e8b734c61260c5202affafae4781627ad136f.tar.gz | |
V4L2 support for OpenBSD, patch by Brad, brad comstyle com
Originally committed as revision 15376 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavdevice/v4l2.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -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 diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 0150c804d4..699a982ac2 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -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> |