diff --git a/cvconfig.h.cmake b/cvconfig.h.cmake index d2421926b4..138defaa97 100644 --- a/cvconfig.h.cmake +++ b/cvconfig.h.cmake @@ -19,6 +19,9 @@ /* V4L2 capturing support */ #cmakedefine HAVE_CAMV4L2 +/* V4L/V4L2 capturing support via libv4l */ +#cmakedefine HAVE_LIBV4L + /* Carbon windowing environment */ #cmakedefine HAVE_CARBON diff --git a/modules/highgui/src/cap.cpp b/modules/highgui/src/cap.cpp index 5d50c3b38f..a5b94cb880 100644 --- a/modules/highgui/src/cap.cpp +++ b/modules/highgui/src/cap.cpp @@ -173,7 +173,7 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index) if (capture) return capture; #endif - #if defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2) + #if defined HAVE_LIBV4L || (defined (HAVE_CAMV4L) && defined (HAVE_CAMV4L2)) capture = cvCreateCameraCapture_V4L (index); if (capture) return capture; diff --git a/modules/highgui/src/cap_libv4l.cpp b/modules/highgui/src/cap_libv4l.cpp index 54cc351128..4e05d79d1c 100644 --- a/modules/highgui/src/cap_libv4l.cpp +++ b/modules/highgui/src/cap_libv4l.cpp @@ -224,7 +224,7 @@ make & enjoy! #include "highgui.h" #include "precomp.hpp" -#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 +#if !defined WIN32 && defined HAVE_LIBV4L #define CLEAR(x) memset (&(x), 0, sizeof (x)) @@ -241,8 +241,12 @@ make & enjoy! #include #include +#ifdef HAVE_CAMV4L #include +#endif +#ifdef HAVE_CAMV4L2 #include +#endif #include #include