diff options
| author | rmcc@localhost.localdomain <rmcc@localhost.localdomain> | 2006-05-18 16:06:06 +0100 |
|---|---|---|
| committer | rmcc@localhost.localdomain <rmcc@localhost.localdomain> | 2006-05-18 16:06:06 +0100 |
| commit | aad2e973e44590acd4c1b55dd32eadad842e7fdb (patch) | |
| tree | de152190bd763eb849cf2952cfb468169f3881ba /test/ioctl-test.c | |
| parent | f637ab4e875bd28b68bbd4d776c2071683050b5c (diff) | |
| parent | 122bd90fa6f72e1366146662e7fb9a6581aab68e (diff) | |
| download | mediapointer-dvb-s2-aad2e973e44590acd4c1b55dd32eadad842e7fdb.tar.gz mediapointer-dvb-s2-aad2e973e44590acd4c1b55dd32eadad842e7fdb.tar.bz2 | |
merge: from master
From: Ricardo Cerqueira <v4l@cerqueira.org>
merging master changes
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'test/ioctl-test.c')
| -rw-r--r-- | test/ioctl-test.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/ioctl-test.c b/test/ioctl-test.c index e150e46da..b7dd87e94 100644 --- a/test/ioctl-test.c +++ b/test/ioctl-test.c @@ -6,7 +6,7 @@ and v4l_decoder.h. These messages shouldn't be handled by video driver itself, but for internal video and/or audio decoders. - Copyright (C) 2005 Mauro Carvalho Chehab <mchehab@brturbo.com.br> + Copyright (C) 2005 Mauro Carvalho Chehab <mchehab@infradead.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,11 +32,13 @@ #include <sys/stat.h> #include <sys/ioctl.h> #include <fcntl.h> +#define __user #include <linux/videodev.h> #ifdef INTERNAL typedef __u8 u8; typedef __u32 u32; +#include <linux/version.h> #include "../linux/include/media/v4l2-common.h" #include <linux/video_decoder.h> #endif @@ -198,7 +200,7 @@ int main (void) char *device="/dev/video0"; union v4l_parms p; - if ((fd = open(device, O_RDONLY)) < 0) { + if ((fd = open(device, O_RDONLY)) < 0) { perror("Couldn't open video0"); return(-1); } |