diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-15 15:25:55 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-15 15:25:55 +0000 |
| commit | 75ea86e31a9ff1b9113fc70aedc95cdd8c651453 (patch) | |
| tree | 6204500027cc7e698564117b346dbf3e1018d9fc /libmpdemux | |
| parent | 908d6db14ad015f1bc225bdec17e5988968c1ef4 (diff) | |
this small patch allows to compile the file libmpdemux/tvi_v4l.c properly,
when the Linux is patched with the V4L2 patch, which automatically
includes <linux/videodev2.h> when you include <linux/videodev.h>.
It is necessary then to prevent <linux/time.h> from including (by defining
the _LINUX_TIME_H macro) in order to resolve some collisions and it is
also necessary to prevent the defining of "struct v4l2_capability" and
"VIDIOC_QUERYCAP" in libmpdemux/tvi_v4l.c, when they are allready defined
in the <linux/videodev2.h>.
Patch by Martin Drab <drab@kepler.fjfi.cvut.cz>, checked by Arpi.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10622 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tvi_v4l.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c index 4fd2608ac8..236db4684e 100644 --- a/libmpdemux/tvi_v4l.c +++ b/libmpdemux/tvi_v4l.c @@ -26,6 +26,10 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/time.h> + +/* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ +#define _LINUX_TIME_H + #include <linux/videodev.h> #include <unistd.h> #include <sys/mman.h> @@ -404,6 +408,7 @@ static void init_v4l_audio(priv_t *priv) } } +#ifndef __LINUX_VIDEODEV2_H struct v4l2_capability { __u8 driver[16]; /* i.e. "bttv" */ @@ -415,6 +420,7 @@ struct v4l2_capability }; #define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) +#endif static int init(priv_t *priv) { |