diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-05 10:20:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-05 10:20:56 -0300 |
| commit | 5f2d82cefe0ce930f3146875c88b993695c7e03a (patch) | |
| tree | 2d33fe6b5949e509d85f48f5c8331adcb22151d3 /v4l2-apps/lib/libv4l/libv4l1/log.c | |
| parent | ad789ba2904603896206a72f0445e8ba56da7134 (diff) | |
| parent | 2257e70baa578d959dc4bdcce498ef07d2af00da (diff) | |
| download | mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.gz mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Fixed a trivial conflict between a janitor's patch from Hans Verkuil and
Andy patch series.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/lib/libv4l/libv4l1/log.c')
| -rw-r--r-- | v4l2-apps/lib/libv4l/libv4l1/log.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/v4l2-apps/lib/libv4l/libv4l1/log.c b/v4l2-apps/lib/libv4l/libv4l1/log.c index cccc3e6d0..74ce0f20b 100644 --- a/v4l2-apps/lib/libv4l/libv4l1/log.c +++ b/v4l2-apps/lib/libv4l/libv4l1/log.c @@ -25,6 +25,7 @@ #include <asm/types.h> /* end broken header workaround includes */ #include <linux/videodev.h> +#include "libv4l1-priv.h" #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) @@ -92,9 +93,9 @@ void v4l1_log_ioctl(unsigned long int request, void *arg, int result) break; case VIDIOCGWIN: case VIDIOCSWIN: - fprintf(v4l1_log_file,"width\t%d\n", + fprintf(v4l1_log_file,"width\t%u\n", ((struct video_window *)arg)->width); - fprintf(v4l1_log_file,"height\t%d\n", + fprintf(v4l1_log_file,"height\t%u\n", ((struct video_window *)arg)->height); break; @@ -115,7 +116,7 @@ void v4l1_log_ioctl(unsigned long int request, void *arg, int result) fprintf(v4l1_log_file,"palette %d\n",( (int)((struct video_picture*)arg)->palette) ); break; - case VIDIOCCAPTURE: fprintf(v4l1_log_file,"on/of? %d\n", *((int *)arg) ); + case VIDIOCCAPTURE: fprintf(v4l1_log_file,"on/off? %d\n", *((int *)arg) ); break; case VIDIOCSYNC: fprintf(v4l1_log_file,"sync %d\n", *((int *)arg) ); |