1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2020-07-13 19:54:49 +00:00
13 changed files with 668 additions and 128 deletions
+4 -3
View File
@@ -1048,15 +1048,16 @@ bool CvCaptureCAM_V4L::grabFrame()
return false;
}
// No need to skip this if the first read returns false
/* preparation is ok */
FirstCapture = false;
#if defined(V4L_ABORT_BADJPEG)
// skip first frame. it is often bad -- this is unnotied in traditional apps,
// but could be fatal if bad jpeg is enabled
if (!read_frame_v4l2())
return false;
#endif
/* preparation is ok */
FirstCapture = false;
}
// In the case that the grab frame was without retrieveFrame
if (bufferIndex >= 0)