Skip to content

Commit

Permalink
Merge pull request opencv#9892 from terfendail:v4l_custom
Browse files Browse the repository at this point in the history
  • Loading branch information
vpisarev committed Oct 27, 2017
2 parents 5384d2f + ad051cd commit 8b1b126
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/videoio/src/cap_v4l.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 8b1b126

Please sign in to comment.