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.
---
libavfilter/avfilter.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index e5dd0cfdb0..689c91891e 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -887,7 +887,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary
**options)
{
int ret = 0;
- ret = av_opt_set_dict(ctx, options);
+ ret = av_opt_set_dict2(ctx, options, AV_OPT_SEARCH_CHILDREN);
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Error applying generic filter options.\n");
return ret;
@@ -902,14 +902,6 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary
**options)
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)
ret = ctx->filter->init(ctx);
if (ret < 0)
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
