Skip to content

V
vlc
Commit 70d74b7f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Revert "Fix v4l2 build failure on Debian/kfreebsd" 

This reverts commit 7711eb75.
This makes no sense as control types are _not_ macros.
(cherry picked from commit 74ba8ca7)
parent 0faef3ee
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/access/v4l2/v4l2.h
View file @ 70d74b7f
...@@ -33,8 +33,11 @@ ...@@ -33,8 +33,11 @@
# warning Please update Video4Linux2 headers! # warning Please update Video4Linux2 headers!
# define V4L2_CTRL_FLAG_VOLATILE 0x0080 # define V4L2_CTRL_FLAG_VOLATILE 0x0080
#endif #endif
#ifndef V4L2_CTRL_TYPE_BITMASK /* 3.1 */ #ifdef __linux__
# define V4L2_CTRL_TYPE_BITMASK 8 # include <linux/version.h>
# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
# define V4L2_CTRL_TYPE_BITMASK 8
# endif
#endif #endif
#ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */ #ifndef V4L2_CID_ILLUMINATORS_1 /* 2.6.37 */
# define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38) # define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment