From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avfilter/graphparser: fix filter instance name when an id is provided
Date: Sun, 5 Mar 2023 19:13:31 -0300
Message-ID: <28283e38-c0c1-b3ef-5591-032abecda47d@gmail.com> (raw)
In-Reply-To: <20230302130243.202-1-jamrial@gmail.com>
On 3/2/2023 10:02 AM, James Almer wrote:
> Restores the behavior of naming the instance filter@id, which was accidentally changed
> to simpy id in commit f17051eaae.
>
> Fixes ticket #10226.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> libavfilter/graphparser.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
> index 8e12416ccb..4347131fad 100644
> --- a/libavfilter/graphparser.c
> +++ b/libavfilter/graphparser.c
> @@ -532,8 +532,7 @@ int avfilter_graph_segment_create_filters(AVFilterGraphSegment *seg, int flags)
> for (size_t j = 0; j < ch->nb_filters; j++) {
> AVFilterParams *p = ch->filters[j];
> const AVFilter *f = avfilter_get_by_name(p->filter_name);
> - char inst_name[30], *name = p->instance_name ? p->instance_name :
> - inst_name;
> + char name[64];
>
> // skip already processed filters
> if (p->filter || !p->filter_name)
> @@ -546,7 +545,9 @@ int avfilter_graph_segment_create_filters(AVFilterGraphSegment *seg, int flags)
> }
>
> if (!p->instance_name)
> - snprintf(inst_name, sizeof(inst_name), "Parsed_%s_%zu", f->name, idx);
> + snprintf(name, sizeof(name), "Parsed_%s_%zu", f->name, idx);
> + else
> + snprintf(name, sizeof(name), "%s@%s", f->name, p->instance_name);
>
> p->filter = avfilter_graph_alloc_filter(seg->graph, f, name);
> if (!p->filter)
Will apply.
_______________________________________________
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".
prev parent reply other threads:[~2023-03-05 22:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 13:02 James Almer
2023-03-05 22:13 ` James Almer [this message]
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=28283e38-c0c1-b3ef-5591-032abecda47d@gmail.com \
--to=jamrial@gmail.com \
--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