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

Merge pull request #11632 from alalek:videoio_fixes

Browse Source
This commit is contained in:
Alexander Alekhin
2018-05-31 12:09:14 +00:00
parent 1b27351f45 ddba772297
commit 49321a233c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap.cpp
+1 -1
View File
@@ -169,7 +169,7 @@ bool VideoCapture::isOpened() const
{
if (!icap.empty())
return icap->isOpened();
return !icap.empty(); // legacy interface doesn't support closed files
return !cap.empty(); // legacy interface doesn't support closed files
}
void VideoCapture::release()
modules/videoio/src/videoio_registry.cpp
+1 -1
View File
@@ -288,7 +288,7 @@ namespace videoio_registry {
std::vector<VideoBackendInfo> getAvailableBackends_CaptureByIndex()
{
const std::vector<VideoBackendInfo> result = VideoBackendRegistry::getInstance().getAvailableBackends_CaptureByFilename();
const std::vector<VideoBackendInfo> result = VideoBackendRegistry::getInstance().getAvailableBackends_CaptureByIndex();
return result;
}
std::vector<VideoBackendInfo> getAvailableBackends_CaptureByFilename()