reverted the original VideoCapture::read() code; moved frame index check to where it should belong: ffmpeg wrapper; applied patch by Rob Reilink (ticket #1971)

2012-06-01 08:55:16 +00:00
parent 586d5a6024
commit 677680d82d
3 changed files with 9 additions and 10 deletions
--- a/modules/highgui/src/cap.cpp
+++ b/modules/highgui/src/cap.cpp
@@ -494,15 +494,8 @@ bool VideoCapture::retrieve(Mat& image, int channel)

 bool VideoCapture::read(Mat& image)
 {
-    double frame_pos = get(CV_CAP_PROP_POS_FRAMES);
-    double frame_count = get(CV_CAP_PROP_FRAME_COUNT);
-    if (frame_pos < frame_count || frame_pos < 0 || frame_count < 0)
-    {
-        if(grab())
-            retrieve(image);
-        else
-            image.release();
-    }
+    if(grab())
+        retrieve(image);
    else
        image.release();
    return !image.empty();