Merge pull request opencv#8712 from grundman:patch-5

vpisarev · vpisarev · commit 0d60c0e8c48c · 2017-05-17T15:02:45.000Z
diff --git a/modules/videoio/src/cap_mjpeg_encoder.cpp b/modules/videoio/src/cap_mjpeg_encoder.cpp
@@ -384,7 +384,7 @@ class mjpeg_buffer
         }
         else
         {
-            data[m_pos] |= (tempval << bits_free);
+            data[m_pos] |= (bits_free == 32) ? tempval : (tempval << bits_free);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ class mjpeg_buffer`
`384`	`384`	`}`
`385`	`385`	`else`
`386`	`386`	`{`
`387`		`- data[m_pos] \|= (tempval << bits_free);`
	`387`	`+ data[m_pos] \|= (bits_free == 32) ? tempval : (tempval << bits_free);`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`