RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/avfilter: move enable_str expression parsing into avfilter_init_dict() 

This ensures that needed arrays are always allocated and properly initialized.

Previously if code would use only avfilter_init_dict() to set options for filters
it would not allocate arrays for timeline processing thus it would crash if
user supplied enable option for filter(s).
This commit is contained in:
Paul B Mahol 2021-02-05 12:23:57 +01:00
parent d0a24bfad1
commit 6317d40d08
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/avfilter.c
View File

@ -875,11 +875,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
count++;
}
if (ctx->enable_str) {
ret = set_enable_expr(ctx, ctx->enable_str);
if (ret < 0)
return ret;
}
return count;
}
@ -930,6 +925,12 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
else if (ctx->filter->init_dict)
ret = ctx->filter->init_dict(ctx, options);
if (ctx->enable_str) {
ret = set_enable_expr(ctx, ctx->enable_str);
if (ret < 0)
return ret;
}
return ret;
}