opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-01 15:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2547 from kkartaltepe/v4l2-control-inf-loop

Browse Source 
linux-v4l2: readonly controls cause infinite loop
This commit is contained in:
Jim
2020-03-22 11:42:32 -07:00
committed by GitHub
parent 4e43329269 7b71a3b33d
commit a0e8adbc42
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/linux-v4l2/v4l2-controls.c
+2 -2
View File
@@ -98,6 +98,8 @@ int_fast32_t v4l2_update_controls(int_fast32_t dev, obs_properties_t *props,
memset(&qctrl, 0, sizeof(qctrl));
qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
while (0 == v4l2_ioctl(dev, VIDIOC_QUERYCTRL, &qctrl)) {
qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
if (qctrl.flags & V4L2_CTRL_FLAG_DISABLED) {
blog(LOG_INFO, "found control %s but it is disabled",
qctrl.name);
@@ -145,8 +147,6 @@ int_fast32_t v4l2_update_controls(int_fast32_t dev, obs_properties_t *props,
(char *)qctrl.name, qctrl.default_value);
break;
}
qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
}
return 0;