[FFmpeg-cvslog] libavdevice: Fix v4l2 compilation under FreeBSD

Tom Evans git at videolan.org
Thu Dec 15 23:02:35 CET 2011


ffmpeg | branch: master | Tom Evans <tevans.uk at googlemail.com> | Thu Dec 15 20:21:54 2011 +0000| [ffa1f541b350946591ea80e134917b28a860fcad] | committer: Michael Niedermayer

libavdevice: Fix v4l2 compilation under FreeBSD

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffa1f541b350946591ea80e134917b28a860fcad
---

 configure          |    2 ++
 libavdevice/v4l2.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 5593938..d59e474 100755
--- a/configure
+++ b/configure
@@ -1138,6 +1138,7 @@ HAVE_LIST="
     altivec_h
     arpa_inet_h
     asm_mod_y
+    asm_types_h
     attribute_may_alias
     attribute_packed
     cbrtf
@@ -2995,6 +2996,7 @@ check_header termios.h
 check_header vdpau/vdpau.h
 check_header vdpau/vdpau_x11.h
 check_header X11/extensions/XvMClib.h
+check_header asm/types.h
 
 disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
 disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index dc54c4a..15356fe 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -41,7 +41,9 @@
 #if HAVE_SYS_VIDEOIO_H
 #include <sys/videoio.h>
 #else
+#if HAVE_ASM_TYPES_H
 #include <asm/types.h>
+#endif
 #include <linux/videodev2.h>
 #endif
 #include <time.h>



More information about the ffmpeg-cvslog mailing list