Mercurial > mplayer.hg

annotate sub_cc.h @ 10621:9f4af7d95d87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author diego
date Fri, 15 Aug 2003 15:25:55 +0000
parents a3b2f80f3a26
children f580a7755ac5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6784
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
1 #ifndef SUB_CC_H
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
2 #define SUB_CC_H
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
3
6790
arpi
parents: 6784
diff changeset
4 extern int subcc_enabled;
6791
a3b2f80f3a26 codmetics :)
arpi
parents: 6790
diff changeset
5
a3b2f80f3a26 codmetics :)
arpi
parents: 6790
diff changeset
6 void subcc_init();
6784
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
7 void subcc_process_data(unsigned char *inputdata,unsigned int len);
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
8
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
9 #endif /*SUB_CC_H*/
b38e38b6f88f DVD Closed Captioning support, patch by Matteo Giani <matgiani@ctonet.it>, small changes by me.
atmos4
parents:
diff changeset
10