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

Merge branch 4.x

Browse Source
This commit is contained in:
OpenCV Developers
2022-04-23 21:42:17 +00:00
parent 3d12581798 767857c516
commit 0fbd58bef9
324 changed files with 34982 additions and 9803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/include/opencv2/videoio.hpp
+2 -2
View File
@@ -751,7 +751,7 @@ public:
*/
CV_WRAP virtual bool open(const String& filename, int apiPreference = CAP_ANY);
/** @brief Opens a camera for video capturing
/** @brief Opens a video file or a capturing device or an IP video stream for video capturing with API Preference and parameters
@overload
@@ -775,7 +775,7 @@ public:
*/
CV_WRAP virtual bool open(int index, int apiPreference = CAP_ANY);
/** @brief Returns true if video capturing has been initialized already.
/** @brief Opens a camera for video capturing with API Preference and parameters
@overload