mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10928 from Mehanik:fix_timeout

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-07 12:34:09 +00:00
commit 8edc2e5aaf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/videoio/src/cap_v4l.cpp
View File

@ -911,7 +911,7 @@ static int mainloop_v4l2(CvCaptureCAM_V4L* capture) {
if(returnCode == -1) if(returnCode == -1)
return -1; return -1;
if(returnCode == 1) if(returnCode == 1)
break; return 1;
} }
} }
return 0; return 0;
@ -956,7 +956,7 @@ static bool icvGrabFrameCAM_V4L(CvCaptureCAM_V4L* capture) {
#if defined(V4L_ABORT_BADJPEG) #if defined(V4L_ABORT_BADJPEG)
// skip first frame. it is often bad -- this is unnotied in traditional apps, // skip first frame. it is often bad -- this is unnotied in traditional apps,
// but could be fatal if bad jpeg is enabled // but could be fatal if bad jpeg is enabled
if(mainloop_v4l2(capture) == -1) if(mainloop_v4l2(capture) != 1)
return false; return false;
#endif #endif
@ -964,7 +964,7 @@ static bool icvGrabFrameCAM_V4L(CvCaptureCAM_V4L* capture) {
capture->FirstCapture = 0; capture->FirstCapture = 0;
} }
if(mainloop_v4l2(capture) == -1) return false; if(mainloop_v4l2(capture) != 1) return false;
return true; return true;
} }