potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into angle_unit

Browse Source
This commit is contained in:
Dominik Kleiser
2015-12-02 18:39:12 +01:00
parent 0c471515fd d5894ef2a8
commit 0ba66aa5b9
3 changed files with 158 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/CMakeLists.txt
+1 -1
View File
@@ -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()
modules/videoio/src/cap_v4l.cpp
+150 -953
View File
File diff suppressed because it is too large Load Diff