[vlc-commits] v4l2: do not #define enumeration member
Rémi Denis-Courmont
git at videolan.org
Wed Apr 4 19:45:20 CEST 2012
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Apr 4 20:42:25 2012 +0300| [acc48997c1b76f225712a893a84eb567c02b71ad] | committer: Rémi Denis-Courmont
v4l2: do not #define enumeration member
Integer values outside a C enumeration are not defined (this is a bug in
V4L2 API really), so this would not work anyway.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=acc48997c1b76f225712a893a84eb567c02b71ad
---
modules/access/v4l2/v4l2.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h
index 6e8b621..8e5e6e5 100644
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -38,12 +38,6 @@
# define V4L2_STD_MTS (V4L2_STD_NTSC_M|V4L2_STD_PAL_M|V4L2_STD_PAL_N|\
V4L2_STD_PAL_Nc)
#endif
-#ifdef __linux__
-# include <linux/version.h>
-# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
-# define V4L2_CTRL_TYPE_BITMASK 8
-# endif
-#endif
#ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
# define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)
# define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+37)
More information about the vlc-commits
mailing list