diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-20 19:07:24 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-20 19:07:24 +0000 |
| commit | b00675499c6d9327aa7ec6f9f8d9d7758d1d3080 (patch) | |
| tree | 72b534dde79c61356acd1cd09c22fcc705a4fe5a /libavdevice | |
| parent | 721da10aeb929964a21890aae0b36b2fe07b1bd2 (diff) | |
| download | ffmpeg-b00675499c6d9327aa7ec6f9f8d9d7758d1d3080.tar.gz | |
Only #include sys/mman.h if configure set HAVE_SYS_MMAN_H.
Originally committed as revision 12521 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/audio.c | 2 | ||||
| -rw-r--r-- | libavdevice/bktr.c | 2 | ||||
| -rw-r--r-- | libavdevice/dv1394.c | 3 | ||||
| -rw-r--r-- | libavdevice/v4l.c | 4 | ||||
| -rw-r--r-- | libavdevice/v4l2.c | 4 | ||||
| -rw-r--r-- | libavdevice/x11grab.c | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/libavdevice/audio.c b/libavdevice/audio.c index 87ffdef121..6cd3313a90 100644 --- a/libavdevice/audio.c +++ b/libavdevice/audio.c @@ -31,7 +31,9 @@ #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/time.h> #define AUDIO_BLOCK_SIZE 4096 diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 0ea8dfb02c..7259f5b623 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -39,7 +39,9 @@ #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/time.h> #include <signal.h> diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 8e2e2f607c..85836f1b80 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -19,11 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include <unistd.h> #include <fcntl.h> #include <errno.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/poll.h> #include <sys/time.h> #include <time.h> diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 5d57a2bbdc..75ee6a35a1 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -18,12 +18,16 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config.h" #include "avformat.h" #include "dsputil.h" #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/time.h> #define _LINUX_TIME_H 1 #include <linux/videodev.h> diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 528acc4345..ab5e6857cb 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -26,11 +26,15 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "config.h" #include "avformat.h" #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/time.h> #include <asm/types.h> #include <linux/videodev2.h> diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index bb08dea91f..04e3190962 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -35,11 +35,14 @@ * and Edouard Gomez <ed.gomez@free.fr>. */ +#include "config.h" #include "avformat.h" #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/time.h> #define _LINUX_TIME_H 1 #include <time.h> |