scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 10:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

dshow: fail on unknown opt + opt prefixes

Browse Source
This commit is contained in:
Martin Pulec
2024-01-12 14:43:00 +01:00
parent 72c0354061
commit d4f80efa56
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_capture/DirectShowGrabber.cpp
View File

@@ -614,7 +614,7 @@ static bool process_args(struct vidcap_dshow_state *s, char *init_fmt) {
} else {
while ((token = strtok_s(init_fmt, ":", &strtok_context)) != NULL) {
init_fmt = NULL;
if (strncmp(token, "device=", strlen("device=")) == 0) {
if (IS_KEY_PREFIX(token, "device")) {
token = strchr(token, '=') + 1;
if (isdigit(token[0])) { // device specified by number
s->deviceNumber = atoi(token);
@@ -623,13 +623,14 @@ static bool process_args(struct vidcap_dshow_state *s, char *init_fmt) {
strcpy_s(s->deviceName, strlen(token) + 1, token);
s->deviceNumber = -1;
}
} else if (strncmp(token, "mode=", strlen("mode=")) == 0) {
} else if (IS_KEY_PREFIX(token, "mode")) {
token = strchr(token, '=') + 1;
s->modeNumber = atoi(token);
} else if (strcmp(token, "RGB") == 0) {
s->desc.color_spec = BGR;
} else {
log_msg(LOG_LEVEL_WARNING, "[dshow] Unknown argument: %s, ignoring.\n", token);
MSG(ERROR, "Unknown argument: %s\n", token);
return false;
}
}
}