Merge pull request #17430 from alalek:issue_17257

5 years ago · 3ed243abde
parent d60524ecfa f1dd5e49c5
commit 3ed243abde
1 changed files with 13 additions and 2 deletions
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@ -1215,9 +1215,20 @@ bool CvCapture_FFMPEG::grabFrame()
 #endif

        int ret = av_read_frame(ic, &packet);
-        if (ret == AVERROR(EAGAIN)) continue;

-        /* else if (ret < 0) break; */
+        if (ret == AVERROR(EAGAIN))
+            continue;
+
+        if (ret == AVERROR_EOF)
+        {
+            if (rawMode)
+                break;
+
+            // flush cached frames from video decoder
+            packet.data = NULL;
+            packet.size = 0;
+            packet.stream_index = video_stream;
+        }

        if( packet.stream_index != video_stream )
        {