Merge pull request #5572 from paroj:nov4l1

d5894ef2 · Alexander Alekhin · 8d921129 · 955f4896 · d5894ef2 · d5894ef2
展开全部显示空白变更内容
内联并排

Showing with 151 addition and 954 deletion

modules/videoio/CMakeLists.txt modules/videoio/CMakeLists.txt +1 -1

modules/videoio/src/cap_v4l.cpp modules/videoio/src/cap_v4l.cpp +150 -953

未找到文件。
--- 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