From patchwork Thu Mar 2 13:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40565 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp4542009pzb; Thu, 2 Mar 2023 05:03:14 -0800 (PST) X-Google-Smtp-Source: AK7set9GWmelqR9/+vaokJ6XhE0ZIkICD3hPrnSesRRbVwvANWvISURQBe/LHFagOJMjBsww01ON X-Received: by 2002:a17:906:19ca:b0:88e:d435:3fd6 with SMTP id h10-20020a17090619ca00b0088ed4353fd6mr9867586ejd.63.1677762194524; Thu, 02 Mar 2023 05:03:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677762194; cv=none; d=google.com; s=arc-20160816; b=RMkwgmbK+bOw9/CMMQDo91WbHSqlJfON6f7Dc7Vh/tQqVEXLd0qV3Lh4uQ+dgMRF1H 5DS365o6Ee+uEcTbUMwuBY0fF1I9TyrkTGi/+dKZe11WOYMGxTR2S2IhdJNwauP7sQtV 2BUU2/0h+LIHsT3t10gFe82pZQIWcnW74VgM4GV7WhyOlxDiB8LvV2EOxks3pk40HJcU xxOuWhUSJ6Z8f5UKlcXizfgW9N/curVu7eIsuMiwZoMEQjN4Lqy52KpIazqv7oaK+S6f Ncdkfp22l3ZjjG5Ox+NH7Oxv5WLkhKZaC4a0vaLJHS9e61Bb1PXqGRBqOTQ8kwy+5qEp LXGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=/8OxJstJnvhZEDEZxRc6goRyPvaPsmMFAGFcl2ePU9s=; b=ls/Jlhge5ZspisXO1j4a5w4DxlpkxAcsa4FdHOAF91Xn7K7/Cp6peVn+EViFfernSW hFs2loXzcyCLURBwL1x1RkNFT8aqYC9iG8x5oopgeFwBaG4jduow78ozcqmI/3m1s/Oa Tl5bS1hDYSeECqFJH/tsBwIQQRzV5/Vlnh6sWy1QfmkEqxJubIaeRTTFTSCaZRiuwfT2 /IthX9pqWnvWtKJl9JBsVW0t/RL7BpyEJhH/r01hUsbI8VP8aJ6DaQ9rungNtApsqB5X p9r2XQJjHdbKaXOHipirmkt+p/dQjzJm8RPRKxxwNBUh84JVcdOGtGqi55eQsHKELekN vAwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pUPW+pLx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dr6-20020a170907720600b008db13af5642si3556293ejc.84.2023.03.02.05.03.00; Thu, 02 Mar 2023 05:03:14 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pUPW+pLx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA95868A969; Thu, 2 Mar 2023 15:02:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC5F468A969 for ; Thu, 2 Mar 2023 15:02:49 +0200 (EET) Received: by mail-oi1-f174.google.com with SMTP id bk32so13410331oib.10 for ; Thu, 02 Mar 2023 05:02:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=NMd+phADJR6K8GkoIY7Dt1CHOSBBY0vL0AsrA4lKGJ0=; b=pUPW+pLxrgjH9liHl/99cr5OQZegQoU+W/6nHSEsMbLJ5Yy5s5YtJi8yh5MuO7UBWp WupsS4VwzDfpaWzZNyPvdwLmkTrdTQnUs1xOTfbUc3tacQIOty43xha+WJAnWriDtGde v2TTJzNjpsm7UmY8ZhpVpiUhE2Sp1M4CAPHt7uy4RfogZub9vSeqOgxByt0H6yUYLAXV 2hNrv31mvpISnwkBhFGZfG1UwolDulVZ5ViUi6XD/8K0H6+j7ncSWfGOCEK1p05lYJkP 6b4tt8nJMwQ0//wj6vAgr1xA6NqHzx74RnNsFg5BZVqQsKnkXQXVD4CRjHsgrd5WeFfu zPsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NMd+phADJR6K8GkoIY7Dt1CHOSBBY0vL0AsrA4lKGJ0=; b=THpSy5ZIuFgKa4ukJGATwI8oFT0X492ll28mgHuwzI+VhDTYf/BPN25vEBOtnoSUbP rHDXVx2lnLsE3OZE+KWiCpdViWZI69qjUx6z9EKgZGszwh/xIR653t9jyuYTzYP21mNZ piTgiR8hrGT8B3AHiY7qDXu3pPJ8JF1fJGE2w6Vf0S3IQ6HibLN0uxJ5qsnZgyt0DdTG byk4kDpXwi2p+wjHoFJUGOFbBvtgGj0mgC4KBlIOZ9WseKjzWuRe0bnbXr0YG6QafGWd h3wm7AunQHIEIsoWd8bHKDtGO5SuW4eOSu65jDYKQGKxiSLNwN8+ohntpUsRMmZ1qJ/2 Kk1w== X-Gm-Message-State: AO0yUKU4pJ8/ZFl7eSMFecMBWi8v43cmRhSKJ6AMO2wPsbydJpM7W9zs yZ5eSOo/p4nghlf52XtqFVZK2l9kG8c= X-Received: by 2002:a05:6808:1b0f:b0:383:b2c0:68b7 with SMTP id bx15-20020a0568081b0f00b00383b2c068b7mr998888oib.16.1677762167795; Thu, 02 Mar 2023 05:02:47 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o131-20020acad789000000b00383ecd10ea6sm6974906oig.20.2023.03.02.05.02.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 05:02:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Mar 2023 10:02:43 -0300 Message-Id: <20230302130243.202-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/graphparser: fix filter instance name when an id is provided X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oI0Uzp+8PlFt 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 --- 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)