From ad051cdd99f9caf211d0dae694187953f57707ba Mon Sep 17 00:00:00 2001 From: Vitaly Tuzov Date: Thu, 19 Oct 2017 20:51:00 +0300 Subject: [PATCH] Fixed CAP_PROP_FORMAT evaluation in case CvCaptureCAM_V4L returns CV_16U image --- 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 de84dbb83f..e943c03459 100644 --- a/modules/videoio/src/cap_v4l.cpp +++ b/modules/videoio/src/cap_v4l.cpp @@ -1636,7 +1636,7 @@ static double icvGetPropertyCAM_V4L (const CvCaptureCAM_V4L* capture, case CV_CAP_PROP_MODE: return capture->palette; case CV_CAP_PROP_FORMAT: - return CV_MAKETYPE(CV_8U, capture->frame.nChannels); + return CV_MAKETYPE(IPL2CV_DEPTH(capture->frame.depth), capture->frame.nChannels); case CV_CAP_PROP_CONVERT_RGB: return capture->convert_rgb; }