vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Oct 3 18:17:36 2011 +0300| [ba35f7328ebd616524726c5dee1e94db6c1e85fd] | committer: Rémi Denis-Courmont
V4L2_CTRL_FLAG_VOLATILE is in Linux 3.2, not 3.1 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba35f7328ebd616524726c5dee1e94db6c1e85fd --- modules/access/v4l2/v4l2.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h index fa11e8b..a96abee 100644 --- a/modules/access/v4l2/v4l2.h +++ b/modules/access/v4l2/v4l2.h @@ -31,11 +31,13 @@ /* Hacks to compile with old headers */ #ifdef __linux__ # include <linux/version.h> -# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) +# if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) # warning Please update Video4Linux2 headers! -# define V4L2_CTRL_TYPE_BITMASK 8 # define V4L2_CTRL_FLAG_VOLATILE 0x0080 # endif +# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) +# define V4L2_CTRL_TYPE_BITMASK 8 +# endif #endif #ifdef HAVE_LIBV4L2 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
