Refresh code. Fix merge conflict

diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt
index 527662b..2ac7811 100644 (file)
--- 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)

diff --git a/modules/highgui/src/cap_dshow.hpp b/modules/videoio/src/cap_dshow.hpp
similarity index 100%
rename from modules/highgui/src/cap_dshow.hpp
rename to modules/videoio/src/cap_dshow.hpp