Refresh code. Fix merge conflict

11 years ago · ca307669d4
parent d58f736935
commit ca307669d4
2 changed files with 1 additions and 0 deletions
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@ -35,6 +35,7 @@ endif()
 if (WIN32 AND HAVE_DSHOW)
  list(APPEND videoio_srcs src/cap_dshow.cpp)
  list(APPEND videoio_hdrs src/cap_dshow.hpp)
 endif()
 if (WIN32 AND HAVE_MSMF)
--- a/modules/videoio/src/cap_dshow.hpp
+++ b/modules/videoio/src/cap_dshow.hpp