scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 14:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Playback: small fixes

Browse Source
This commit is contained in:
Martin Pulec
2014-01-29 13:00:31 +01:00
parent 5b09a9fd24
commit 7e5d007019
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_capture.c
View File

@@ -612,6 +612,8 @@ static bool vidcap_dispatch_alias(struct vidcap_params *params)
char *delim = strchr(params->driver, ':');
params->fmt = strdup(delim + 1);
*delim = '\0';
} else {
params->fmt = params->driver + strlen(params->driver); // is '\0'
}
ret = true;
}
@@ -643,6 +645,8 @@ void vidcap_params_set_device(struct vidcap_params *params, const char *config)
char *delim = strchr(params->driver, ':');
*delim = '\0';
params->fmt = strdup(delim + 1);
} else {
params->fmt = strdup("");
}
}
}

4
src/video_capture/import.c
View File

@@ -307,9 +307,9 @@ vidcap_import_init(const struct vidcap_params *params)
char *tmp = strdup(vidcap_params_get_fmt(params));
char *save_ptr;
const char *directory = strtok_r(tmp, ":", &save_ptr);
if (strcmp(directory, "help") == 0) {
if (!directory || strcmp(directory, "help") == 0) {
fprintf(stderr, "Import usage:\n"
"\t<directory>{:loop|:mt_reading=<nr_threads>|:<o_direct>}");
"\t<directory>{:loop|:mt_reading=<nr_threads>|:o_direct}");
return NULL;
}
char *suffix;