summaryrefslogtreecommitdiff
path: root/v4l2-apps/lib/libv4l/libv4l2/log.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-08-31 08:23:58 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-08-31 08:23:58 +0200
commit83027ea1202394a80ca58ed8da84e207d855521e (patch)
treee785ac503165d57d3a5cfb88f20eff034d12199f /v4l2-apps/lib/libv4l/libv4l2/log.c
parentf1a52a2e70204db19b6c81bb59de2c759cefaaa6 (diff)
parent7804585be37d9aa982df2d476a795cbe459dae4a (diff)
downloadmediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.gz
mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'v4l2-apps/lib/libv4l/libv4l2/log.c')
-rw-r--r--v4l2-apps/lib/libv4l/libv4l2/log.c6
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;
}