Merge pull request #14036 from jveitchmichaelis:Y16_v4l_fix

ea9a17eb · Alexander Alekhin · 61eb1a68 · 2143f7ce · ea9a17eb
Commit ea9a17eb authored Mar 12, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cap_v4l.cpp modules/videoio/src/cap_v4l.cpp +4 -2

No files found.
--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp
@@ -1803,9 +1803,11 @@ bool CvCaptureCAM_V4L::setProperty( int property_id, double _value )
        if (bool(value)) {
            convert_rgb = convertableToRgb();
            return convert_rgb;
+        }else{
+            convert_rgb = false;
+            releaseFrame();
+            return true;
        }
-        convert_rgb = false;
-        return true;
    case cv::CAP_PROP_FOURCC:
    {
        if (palette == static_cast<__u32>(value))