Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols

e5236cec · Alexander Alekhin · 6aff916a · 9988e1b6 · e5236cec
Commit e5236cec authored Sep 04, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cap_v4l.cpp modules/videoio/src/cap_v4l.cpp +3 -1

No files found.
--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp
@@ -512,9 +512,11 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)

    for (ctrl_id = V4L2_CID_PRIVATE_BASE;;ctrl_id++)
    {
+        errno = 0;
+
        v4l2_control_range(capture, ctrl_id);

-        if (errno == EINVAL)
+        if (errno)
            break;
    }