diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-07 17:31:35 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-07 17:31:35 +0000 |
| commit | 1df1992a4b5b23cabb2851fe902b214f6ceb9381 (patch) | |
| tree | e644ddc4fdfd741c57a2dd098691e260ffc86c99 /src/input/input_v4l2.c | |
| parent | 755a021dd10786f564fba86be431f04017348128 (diff) | |
| parent | 82083a26798febc8184717d4b6a3eda94fb48925 (diff) | |
| download | xine-lib-1df1992a4b5b23cabb2851fe902b214f6ceb9381.tar.gz xine-lib-1df1992a4b5b23cabb2851fe902b214f6ceb9381.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/input/input_v4l2.c')
| -rw-r--r-- | src/input/input_v4l2.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/input/input_v4l2.c b/src/input/input_v4l2.c index ef08a63ee..b2938d609 100644 --- a/src/input/input_v4l2.c +++ b/src/input/input_v4l2.c @@ -37,7 +37,13 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <linux/videodev2.h> +#ifdef HAVE_SYS_VIDEOIO_H +# include <sys/videoio.h> +#elif defined(HAVE_SYS_VIDEODEV2_H) +# include <sys/videodev2.h> +#else +# include <linux/videodev2.h> +#endif #include <sys/mman.h> #include <stdio.h> #include <errno.h> |