From patchwork Fri Sep 20 13:30:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51679 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp971481vqb; Fri, 20 Sep 2024 06:30:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUf03dNGb6oLiYiHG2kHuvIGL6j6t1qkvjs75oaEyIOpeygsADBXAbfad0+8OU3Ld+MDJ7c5CTircX8V5oub4iG@gmail.com X-Google-Smtp-Source: AGHT+IESwAAjbprWH1USwZsNBaOT3oQRVm/F5GU5YcSH+AOAAlSIM2cEv6Xdlj2j/xfviPeAPxxf X-Received: by 2002:a05:6512:acb:b0:536:a4e9:9cf7 with SMTP id 2adb3069b0e04-536ac3400e3mr1892253e87.56.1726839053001; Fri, 20 Sep 2024 06:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726839052; cv=none; d=google.com; s=arc-20240605; b=bFFWolRf2ch0paUDN2xz/PLPYn7ifPXtllsky0QbbWuKFdm8gaapaDC+dA6/0un1Gx WFF8WN4UfRBY/GoPdKhhB13Vercdee7+a3k467U1txvty7n9mP5N7yHrrD+zrCyAGiCf Zy01tEM+QCX89puQMZCrHqj5blbK/fk1rQ7Fax68hnHWp1Uqsgfkyxp8f4N8ogIx1eiw ffEiWSe6Ue4pLLiSVgEkfm+t7bxL4hUBAmQGcfpG82NmqBoowsEmEj6Y5N7OYeBmapgf knZ9CVbcFagkL1g0ucoMkdr0onD8XLpLePQ5VcjQj+3KBTcmG5S+j1UI96OqMv9/BX32 toHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=KBeAE1h/8USaRnnxbRQPZwDHxKJ4ylzMIXnCoZ5kLUc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B5oPMhOUAOFaiZkogCLYaB4MUpuJi4RaXsmSWxIE2qyexUOBp/SmlIoWwJndIYtKVa 6tr1Zykta9JFykN4ndeEp9iv9UjuKd6mLlRwKd3QYgTTdaLi9oh3KAme3kpSVZQLw19C qHC+xcfP8bDnhEU5dZqz84NqqsK5YBoCyGPxZu83zCdx1W0ulFI5d1aPHvfxaL4pCXts tLc9DCUrYMDzbZtb0GD1AsnWIQwkEMYS++xfCCcYqkdDQFhhGz+F6mAZr/hfBo1ZOOkd 2t3TKt8IP1BwU9CGEmKxStmLlHpctPaGSh5GAr4x2p4iyX62+0OatyTNJYBKda/5qQti hL4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=UOZhlyH5; 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; dara=fail header.i=@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 2adb3069b0e04-536870a0c8esi4787132e87.426.2024.09.20.06.30.51; Fri, 20 Sep 2024 06:30:52 -0700 (PDT) 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=20230601 header.b=UOZhlyH5; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 807A068D7A0; Fri, 20 Sep 2024 16:30:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C18E568D7A0 for ; Fri, 20 Sep 2024 16:30:32 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-718e6299191so1120605b3a.2 for ; Fri, 20 Sep 2024 06:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726839030; x=1727443830; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ElTv1CJyfe2BHAaRJSyc45Kb1rkyEGx50jKtL73UZ7M=; b=UOZhlyH5MeU+zKCshbzVPE7W9ksxxHTyqF27C7sVBEc6J+JUnpPy5wkYlS8/9LUKqV 1x9GtGcY0gL079oClC3jiaBLg8M+8tMiHKpK4968BhNkG4NJi+Mo7zgfOB5MCe7icS5Z c2UTaj82BnXZOGLdSPAbOFsiTtGh7Oxa0UyHEewSxRKOE6JyHyalZ0J7nIkG8JsnuFZ/ JTHivfQthSXYmEtd0fo9Up6FPUafGf+VMgUf53I4a2xuNwEg03MpcV+TTGDw3MURFQ2G f4R3e23hCmK6wbaFXK/dlCHRdAINVh9kVwELze+mEEX2+Lsms8BguSa9cE+U/3M3xJRz rHHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726839030; x=1727443830; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ElTv1CJyfe2BHAaRJSyc45Kb1rkyEGx50jKtL73UZ7M=; b=st9MxVhnWnC84zVMwaCq2EZROYEBDk/7ygBMmbcSS51vz+f7NSHocGjnZFJwLSoSR2 Aes92Tg32zHodFYNJ4GTXxNN1g9s7+3unKzdPBl46RdMl1O9zUTtgjuqh16O8/e5Xy/y r7rUnc2a6CWShTAYXpvBsHsrYVgPNyHJ3abt2IYb9VeyQsS62SbyXYtv/hz3v3qFaOGV s/2I/7cyA3/wCa26aN7VGm/M51rHUkT+U1NZOKQ3vF5I2K8go/Q2zFOCyyBHiwVgn+AG uAlhrUJMBPyuh6gNI+nzjsgcl8fXHidW9Oc1Zc1Q8LZNoWWfmBEnY+HZm8UxiWpWxKjg 6Zag== X-Gm-Message-State: AOJu0YxBTtkwpXkxGU9xX8d2xSyIqLM4dC+WeEkI51TXizzd1eCnte9r y96So8flYoWXmF0/3fOr/77FK9j9rdwi0TxqHvflyDgqgiBrfeSVgDNuCg== X-Received: by 2002:a05:6a21:164a:b0:1d2:e8aa:1d91 with SMTP id adf61e73a8af0-1d30ca200cbmr3382623637.21.1726839028497; Fri, 20 Sep 2024 06:30:28 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71944ab5585sm9757030b3a.54.2024.09.20.06.30.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2024 06:30:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Sep 2024 10:30:42 -0300 Message-ID: <20240920133042.1211-2-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240920133042.1211-1-jamrial@gmail.com> References: <20240920133042.1211-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_filter: ensure that the inserted filters exist 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: zaiXtI56aC7i If not, report it as a bug. avfilter_graph_create_filter() will return ENOMEM if the passed filter argument is NULL, which is misleading. Signed-off-by: James Almer --- fftools/ffmpeg_filter.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 8b420e68ab..27d74341b5 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1444,11 +1444,15 @@ static int insert_filter(AVFilterContext **last_filter, int *pad_idx, const char *filter_name, const char *args) { AVFilterGraph *graph = (*last_filter)->graph; + const AVFilter *filter = avfilter_get_by_name(filter_name) AVFilterContext *ctx; int ret; + if (!filter) + return AVERROR_BUG; + ret = avfilter_graph_create_filter(&ctx, - avfilter_get_by_name(filter_name), + filter, filter_name, args, NULL, graph); if (ret < 0) return ret;