Merge branch 'main' into experimental

floe · Jan 30, 2022 · 0643e2b · 0643e2b
2 parents 5e5099d + eeb0ae9
commit 0643e2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -88,6 +88,7 @@ Tested with the following software:
   - Microsoft Teams
     - 1.3.00.30857 (works)
     - 1.3.00.5153 (works)
+    - 1.4.00.26453 (works)
   - Chrome
     - 87.0.4280.88 (works)
     - 81.0.4044.138 (works)

diff --git a/tensorflow b/tensorflow
diff --git a/videoio/loopback.cc b/videoio/loopback.cc
@@ -55,6 +55,11 @@ int loopback_init(const std::string& device, int w, int h, int debug) {
 	vid_format.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
 
 	ret_code = ioctl(fdwr, VIDIOC_G_FMT, &vid_format);
+	if(ret_code < 0) {
+		fprintf(stderr, "%s:%d(%s): Failed to get device video format: %s\n", __FILE__, __LINE__, __func__, strerror(errno));
+		close(fdwr);
+		return -1;
+	}
 
 	if(ret_code < 0) {
 		fprintf(stderr, "%s:%d(%s): Failed to get device video format: %s\n", __FILE__, __LINE__, __func__, strerror(errno));