diff options
| author | hans@localhost.localdomain <hans@localhost.localdomain> | 2008-08-06 10:49:16 +0200 |
|---|---|---|
| committer | hans@localhost.localdomain <hans@localhost.localdomain> | 2008-08-06 10:49:16 +0200 |
| commit | cfbd2d6622d7a75929f34972ca407acb4437d3d2 (patch) | |
| tree | e909f6a9eb1513ea2f929f1db36722d4cc541e52 /v4l2-apps/lib/libv4l/libv4l2 | |
| parent | efcc2c1bf27fed430cbff0603d9d09cb88d1fad4 (diff) | |
| download | mediapointer-dvb-s2-cfbd2d6622d7a75929f34972ca407acb4437d3d2.tar.gz mediapointer-dvb-s2-cfbd2d6622d7a75929f34972ca407acb4437d3d2.tar.bz2 | |
libv4l: Fix errors and warnings when compiling with ICC
From: Gregor Jasny <jasny@vidsoft.de>
libv4l: Fix errors and warnings when compiling with ICC
Priority: normal
Signed-off-by: Gregor Jasny <jasny@vidsoft.de>
Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Diffstat (limited to 'v4l2-apps/lib/libv4l/libv4l2')
| -rw-r--r-- | v4l2-apps/lib/libv4l/libv4l2/Makefile | 2 | ||||
| -rw-r--r-- | v4l2-apps/lib/libv4l/libv4l2/log.c | 5 | ||||
| -rw-r--r-- | v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/v4l2-apps/lib/libv4l/libv4l2/Makefile b/v4l2-apps/lib/libv4l/libv4l2/Makefile index ff3cb9ddc..63c228300 100644 --- a/v4l2-apps/lib/libv4l/libv4l2/Makefile +++ b/v4l2-apps/lib/libv4l/libv4l2/Makefile @@ -1,7 +1,7 @@ override CPPFLAGS += -I../include -I../../../../linux/include CFLAGS := -g -O1 -CFLAGS += -Wall -W -Wno-unused -Wpointer-arith -Wstrict-prototypes +CFLAGS += -Wall -Wno-unused -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes LIBS = -lpthread diff --git a/v4l2-apps/lib/libv4l/libv4l2/log.c b/v4l2-apps/lib/libv4l/libv4l2/log.c index 05f6c46d7..414634b53 100644 --- a/v4l2-apps/lib/libv4l/libv4l2/log.c +++ b/v4l2-apps/lib/libv4l/libv4l2/log.c @@ -25,6 +25,7 @@ #include <asm/types.h> /* end broken header workaround includes */ #include <linux/videodev2.h> +#include "libv4l2-priv.h" #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) @@ -116,7 +117,7 @@ void v4l2_log_ioctl(unsigned long int request, void *arg, int result) int pixfmt = fmt->fmt.pix.pixelformat; if (fmt->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { - fprintf(v4l2_log_file, " pixelformat: %c%c%c%c %dx%d\n", + fprintf(v4l2_log_file, " pixelformat: %c%c%c%c %ux%u\n", pixfmt & 0xff, (pixfmt >> 8) & 0xff, (pixfmt >> 16) & 0xff, @@ -136,7 +137,7 @@ void v4l2_log_ioctl(unsigned long int request, void *arg, int result) struct v4l2_requestbuffers *req = arg; fprintf(v4l2_log_file, " count: %u type: %d memory: %d\n", - req->count, req->type, req->memory); + req->count, (int)req->type, (int)req->memory); } break; } diff --git a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c b/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c index f312828c6..9420e6846 100644 --- a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c +++ b/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c @@ -27,6 +27,8 @@ #include <syscall.h> #include <fcntl.h> #include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> /* These headers are not needed by us, but by linux/videodev2.h, which is broken on some systems and doesn't include them itself :( */ #include <sys/time.h> |