Merge pull request #8712 from grundman:patch-5

2017-05-17 15:02:45 +00:00 · 2017-05-17 15:02:45 +00:00 · 0d60c0e8c4
commit 0d60c0e8c4
parent 03aa69da99 0e64e68d31
1 changed files with 1 additions and 1 deletions
--- a/modules/videoio/src/cap_mjpeg_encoder.cpp
+++ b/modules/videoio/src/cap_mjpeg_encoder.cpp
@ -384,7 +384,7 @@ public:
        }
        else
        {
-            data[m_pos] |= (tempval << bits_free);
+            data[m_pos] |= (bits_free == 32) ? tempval : (tempval << bits_free);
        }
    }