highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_mux_init: remove whitespaces from input arguments when parsing stream groups

Browse Source 
If the arguments are read from a file, things like line breaks could be present

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2024-01-19 15:47:40 -03:00
parent 6c4388b468
commit 04a37e238f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fftools/ffmpeg_mux_init.c
View File

@@ -2025,6 +2025,8 @@ static int of_parse_iamf_audio_element_layers(Muxer *mux, AVStreamGroup *stg, ch
int demixing = 0, recon_gain = 0; int demixing = 0, recon_gain = 0;
int layer = 0; int layer = 0;
if (ptr)
ptr += strspn(ptr, " \n\t\r");
if (av_strstart(token, "layer=", &token)) if (av_strstart(token, "layer=", &token))
layer = 1; layer = 1;
else if (av_strstart(token, "demixing=", &token)) else if (av_strstart(token, "demixing=", &token))
@@ -2092,6 +2094,8 @@ static int of_parse_iamf_submixes(Muxer *mux, AVStreamGroup *stg, char *ptr)
const char *subtoken; const char *subtoken;
char *subptr = NULL; char *subptr = NULL;
if (ptr)
ptr += strspn(ptr, " \n\t\r");
if (!av_strstart(token, "submix=", &token)) { if (!av_strstart(token, "submix=", &token)) {
av_log(mux, AV_LOG_ERROR, "No submix in mix presentation specification \"%s\"\n", token); av_log(mux, AV_LOG_ERROR, "No submix in mix presentation specification \"%s\"\n", token);
goto fail; goto fail;
@@ -2120,6 +2124,8 @@ static int of_parse_iamf_submixes(Muxer *mux, AVStreamGroup *stg, char *ptr)
const AVDictionaryEntry *e; const AVDictionaryEntry *e;
int element = 0, layout = 0; int element = 0, layout = 0;
if (subptr)
subptr += strspn(subptr, " \n\t\r");
if (av_strstart(subtoken, "element=", &subtoken)) if (av_strstart(subtoken, "element=", &subtoken))
element = 1; element = 1;
else if (av_strstart(subtoken, "layout=", &subtoken)) else if (av_strstart(subtoken, "layout=", &subtoken))
@@ -2331,8 +2337,11 @@ static int of_add_groups(Muxer *mux, const OptionsContext *o)
return ret; return ret;
token = av_strtok(str, ",", &ptr); token = av_strtok(str, ",", &ptr);
if (token) if (token) {
if (ptr)
ptr += strspn(ptr, " \n\t\r");
ret = of_parse_group_token(mux, token, ptr); ret = of_parse_group_token(mux, token, ptr);
}
av_free(str); av_free(str);
if (ret < 0) if (ret < 0)