diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 14:46:21 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 14:46:21 -0300 |
commit | 8030ee67bdce5ce3725581d715f9451b950d45da (patch) | |
tree | 81af4c86341760d746e90ea43778181aa20f2f7b /v4l2-apps/lib/libv4l/libv4l2/log.c | |
parent | 19050620d7676a007898ae8404ad4edc757f9d2f (diff) | |
parent | b29c49d48ca0db5d5e8e98f1622be4d0311656c4 (diff) | |
download | mediapointer-dvb-s2-8030ee67bdce5ce3725581d715f9451b950d45da.tar.gz mediapointer-dvb-s2-8030ee67bdce5ce3725581d715f9451b950d45da.tar.bz2 |
merge: http://linuxtv.org/hg/~hgoede/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/lib/libv4l/libv4l2/log.c')
-rw-r--r-- | v4l2-apps/lib/libv4l/libv4l2/log.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/v4l2-apps/lib/libv4l/libv4l2/log.c b/v4l2-apps/lib/libv4l/libv4l2/log.c index 05f6c46d7..6237d55ec 100644 --- a/v4l2-apps/lib/libv4l/libv4l2/log.c +++ b/v4l2-apps/lib/libv4l/libv4l2/log.c @@ -25,6 +25,8 @@ #include <asm/types.h> /* end broken header workaround includes */ #include <linux/videodev2.h> +#include "libv4l2.h" +#include "libv4l2-priv.h" #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) @@ -116,7 +118,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 +138,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; } |