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 /drivers/tdfx_vid.c | |
| 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 'drivers/tdfx_vid.c')
0 files changed, 0 insertions, 0 deletions