From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 5/8] lavfi/avfilter: simplify process_options()
Date: Sun, 8 Jan 2023 13:58:08 +0100
Message-ID: <20230108125811.17967-5-anton@khirnov.net> (raw)
In-Reply-To: <20230108125811.17967-1-anton@khirnov.net>
This function currently treats AVFilterContext options and
filter-private options differently: the former are immediately applied,
while the latter are stored in a dictionary to be applied later.
There is no good reason for having two branches - storing all options in
the dictionary is simpler and achieves the same effect (since it is
later applied with av_opt_set_dict()).
This will also be useful in future commits.
---
libavfilter/avfilter.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 278d5868de..43dfb11bdb 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -842,16 +842,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value);
- if (av_opt_find(ctx, key, NULL, 0, 0)) {
- ret = av_opt_set(ctx, key, value, 0);
- if (ret < 0) {
- av_free(value);
- av_free(parsed_key);
- return ret;
- }
- } else {
- av_dict_set(options, key, value, AV_DICT_MULTIKEY);
- }
+ av_dict_set(options, key, value, AV_DICT_MULTIKEY);
av_free(value);
av_free(parsed_key);
--
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-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-01-08 12:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-08 12:58 [FFmpeg-devel] [PATCH 1/8] lavfi/vf_scale: allow passing options to swscale directly Anton Khirnov
2023-01-08 12:58 ` [FFmpeg-devel] [PATCH 2/8] lavfi: remove AVFilter.init_dict() Anton Khirnov
2023-01-08 12:58 ` [FFmpeg-devel] [PATCH 3/8] lavfi/avfilter: avoid a redundant av_opt_set_dict2() call Anton Khirnov
2023-01-08 12:58 ` [FFmpeg-devel] [PATCH 4/8] lavfi/avfilter: export a multikey dict from process_options() Anton Khirnov
2023-01-08 12:58 ` Anton Khirnov [this message]
2023-01-08 12:58 ` [FFmpeg-devel] [PATCH 6/8] lavfi/avfilter: process options for filters without a private class Anton Khirnov
2023-01-08 12:58 ` [FFmpeg-devel] [PATCH 7/8] lavfi/graphparser: improve applying graph-level sws options Anton Khirnov
2023-01-08 12:58 ` [FFmpeg-devel] [PATCH 8/8] lavfi/graphparser: drop a redundant label Anton Khirnov
2023-01-09 12:51 ` [FFmpeg-devel] [PATCH 1/8] lavfi/vf_scale: allow passing options to swscale directly Nicolas George
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230108125811.17967-5-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git