From 0e64e68d31fe93401923e2007789e0ca84c5791a Mon Sep 17 00:00:00 2001 From: Matthias Grundmann Date: Wed, 10 May 2017 13:29:02 -0700 Subject: [PATCH] Update cap_mjpeg_encoder.cpp Avoid shifting by 32bits; undefined behavior according to c - standard --- modules/videoio/src/cap_mjpeg_encoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/videoio/src/cap_mjpeg_encoder.cpp b/modules/videoio/src/cap_mjpeg_encoder.cpp index 0503f2f94d..0e7cc7d279 100644 --- 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); } }