Merge pull request #8981 from alalek:port_8979

8c27ceb9 · Maksim Shabunin · b3cd2448 · 35a2f2fe · 8c27ceb9
Commit 8c27ceb9 authored 7 years ago by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

cap_avfoundation_mac.mm modules/videoio/src/cap_avfoundation_mac.mm +9 -1

No files found.
--- a/modules/videoio/src/cap_avfoundation_mac.mm
+++ b/modules/videoio/src/cap_avfoundation_mac.mm
@@ -694,7 +694,15 @@ CvCaptureFile::CvCaptureFile(const char* filename) {
        return;
    }

-    mAssetTrack = [[mAsset tracksWithMediaType: AVMediaTypeVideo][0] retain];
+    NSArray *tracks = [mAsset tracksWithMediaType:AVMediaTypeVideo];
+    if ([tracks count] == 0) {
+        fprintf(stderr, "OpenCV: Couldn't read video stream from file \"%s\"\n", filename);
+        [localpool drain];
+        started = 0;
+        return;
+    }
+
+    mAssetTrack = [tracks[0] retain];

    if ( ! setupReadingAt(kCMTimeZero) ) {
        fprintf(stderr, "OpenCV: Couldn't read movie file \"%s\"\n", filename);