Merge pull request #12166 from berak:fix_mjpeg_decoder

731aa963 · Maksim Shabunin · 4fe900c3 · 7e353a1e · 731aa963
Commit 731aa963 authored Aug 07, 2018 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

cap_mjpeg_decoder.cpp modules/videoio/src/cap_mjpeg_decoder.cpp +3 -0

No files found.
--- a/modules/videoio/src/cap_mjpeg_decoder.cpp
+++ b/modules/videoio/src/cap_mjpeg_decoder.cpp
@@ -146,6 +146,9 @@ bool MotionJpegCapture::grabFrame()
        }
        else
        {
+            if (m_frame_iterator == m_mjpeg_frames.end())
+                return false;
+
            ++m_frame_iterator;
        }
    }