Merge pull request #5572 from paroj:nov4l1

2015-12-02 16:49:59 +00:00 · 2015-12-02 16:49:59 +00:00 · d5894ef2a8
commit d5894ef2a8
parent 8d921129a7 955f489621
2 changed files with 151 additions and 954 deletions
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@ -101,7 +101,7 @@ endif(HAVE_UNICAP)

 if(HAVE_LIBV4L)
  list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_libv4l.cpp)
-elseif(HAVE_CAMV4L OR HAVE_CAMV4L2 OR HAVE_VIDEOIO)
+elseif(HAVE_CAMV4L2 OR HAVE_VIDEOIO)
  list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_v4l.cpp)
 endif()

--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp