Merge pull request #9479 from alalek:issue_9477

d861c033 · Vadim Pisarevsky · 52a60526 · 897b071b · d861c033
Commit d861c033 authored Aug 28, 2017 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

cap_v4l.cpp modules/videoio/src/cap_v4l.cpp +6 -6

No files found.
--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp
@@ -460,18 +460,18 @@ static int autosetup_capture_mode_v4l2(CvCaptureCAM_V4L* capture) {
    }
    __u32 try_order[] = {
            V4L2_PIX_FMT_BGR24,
+            V4L2_PIX_FMT_RGB24,
            V4L2_PIX_FMT_YVU420,
            V4L2_PIX_FMT_YUV411P,
-#ifdef HAVE_JPEG
-            V4L2_PIX_FMT_MJPEG,
-            V4L2_PIX_FMT_JPEG,
-#endif
            V4L2_PIX_FMT_YUYV,
            V4L2_PIX_FMT_UYVY,
-            V4L2_PIX_FMT_SN9C10X,
            V4L2_PIX_FMT_SBGGR8,
            V4L2_PIX_FMT_SGBRG8,
-            V4L2_PIX_FMT_RGB24,
+            V4L2_PIX_FMT_SN9C10X,
+#ifdef HAVE_JPEG
+            V4L2_PIX_FMT_MJPEG,
+            V4L2_PIX_FMT_JPEG,
+#endif
            V4L2_PIX_FMT_Y16
    };