generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refresh code. Fix merge conflict

Browse Source
This commit is contained in:
VBystricky 2014-07-14 23:30:50 +04:00
parent d58f736935
commit ca307669d4
2 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/videoio/CMakeLists.txt
View File

@ -35,6 +35,7 @@ endif()
if (WIN32 AND HAVE_DSHOW) if (WIN32 AND HAVE_DSHOW)
list(APPEND videoio_srcs src/cap_dshow.cpp) list(APPEND videoio_srcs src/cap_dshow.cpp)
list(APPEND videoio_hdrs src/cap_dshow.hpp)
endif() endif()
if (WIN32 AND HAVE_MSMF) if (WIN32 AND HAVE_MSMF)

0
modules/highgui/src/cap_dshow.hpp → modules/videoio/src/cap_dshow.hpp
View File