From 955f489621f675a2fc37bce15cbda0430ac1a2af Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Sun, 1 Nov 2015 11:41:26 +0100 Subject: [PATCH] make CV_CAP_PROP_FORMAT consider the current channel count --- modules/videoio/src/cap_v4l.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/videoio/src/cap_v4l.cpp b/modules/videoio/src/cap_v4l.cpp index 00f6b21b1a..36dd928ec4 100644 --- a/modules/videoio/src/cap_v4l.cpp +++ b/modules/videoio/src/cap_v4l.cpp @@ -1583,7 +1583,7 @@ static double icvGetPropertyCAM_V4L (const CvCaptureCAM_V4L* capture, case CV_CAP_PROP_MODE: return capture->palette; case CV_CAP_PROP_FORMAT: - return CV_8UC3; + return CV_MAKETYPE(CV_8U, capture->frame.nChannels); case CV_CAP_PROP_CONVERT_RGB: return capture->convert_rgb; }