virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

lavfi/avfilter: avoid a redundant av_opt_set_dict2() call

Browse Source 
Current code first sets AVFilterContext-level options, then aplies the
leftover on the filter's private data. This is unnecessary, applying the
options to AVFilterContext with the AV_OPT_SEARCH_CHILDREN flag
accomplishes the same effect.
This commit is contained in:
Anton Khirnov 2023-01-06 19:13:13 +01:00
parent a7b1b4bc23
commit bd7c07c26a
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/avfilter.c
View File

@ -887,7 +887,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
{ {
int ret = 0; int ret = 0;
ret = av_opt_set_dict(ctx, options); ret = av_opt_set_dict2(ctx, options, AV_OPT_SEARCH_CHILDREN);
if (ret < 0) { if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Error applying generic filter options.\n"); av_log(ctx, AV_LOG_ERROR, "Error applying generic filter options.\n");
return ret; return ret;
@ -902,14 +902,6 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
ctx->thread_type = 0; ctx->thread_type = 0;
} }
if (ctx->filter->priv_class) {
ret = av_opt_set_dict2(ctx->priv, options, AV_OPT_SEARCH_CHILDREN);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Error applying options to the filter.\n");
return ret;
}
}
if (ctx->filter->init) if (ctx->filter->init)
ret = ctx->filter->init(ctx); ret = ctx->filter->init(ctx);
if (ret < 0) if (ret < 0)