From patchwork Wed Sep 25 13:29:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp472653vqk; Wed, 25 Sep 2024 06:39:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRBVPx2H/zcSt2GWRk26DI7P6t4hAMjDRnM+brhJXhc0ez7Y9px5eHPngpRjkcNv8RGlSAOxgcpU46P7wDL7Q0@gmail.com X-Google-Smtp-Source: AGHT+IFTNFA97F8OLMBtgMQU28IwV80jNR4fkDvXvVeSQod1/sxtnCQ5VCtdGBBhukgcqst7dn9D X-Received: by 2002:a05:6512:b8a:b0:536:a4e9:9cf7 with SMTP id 2adb3069b0e04-53877566002mr1475549e87.56.1727271572499; Wed, 25 Sep 2024 06:39:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727271572; cv=none; d=google.com; s=arc-20240605; b=fgysDMA/bh6JlRwqHQj3mrqtBp9vuSrUG+1TCTvCtW1KcA+cGGBI+JuE7vmLSuUcQg ha5nM9HyO5/t5NrTAZT91OylGWZibZMyXvjmVnmc8iUGqYVN3lTj0Ls6h4F5afpEGygj h3uxEEy80fB30IgK17aiBQJMj2J+jc+0CUNu8I2FjZLg8fat0kmsg/7ySRlZMoBNJO4H 5ivfxt+puPlYRd/dLsHkHdSzCaNV61aXO2TfIvOhXIDe22P8P96CshGqXihQGWHxawEc IffkqtVcm3aJYAk1Bvhxwe8G+xHzr2eE3qEMWKRPJ9gIBL7TTNxJHPhQrXfsFm9dRvvv kaKQ== 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=JJAij0zlEFoCFNi2+yQrPOm3ltRAcYg8WGGV9p7RRbw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=NIvC61BtPSSfYr7cHzf7HUlh5V12rebBW5aXKjdXICLpfSNqVJ7l6nLi0mD8YpirsE owkv3H5StR4lth/B0b0v0lpogcsq7erISzGLzet1KKdYpeBe0dys887OvDlJPlvzS+mS otwxMoOgsJ1rlRH4PmarYDqbgFGoInMBUg8tg+NI6Dp3qsw9E513kIc3hTaRT27ovBzk 8t4Y8dMl2l/Tdlpz3qh/K+AynF96wYx33wT+8M5ecsxcLl5aenwvDuvySm/DeORY1Bht LwR1GtXM790EC4TT591XLjCrsEGt5VrwKkmliAxNRtHowep9/TUPdSpMLk7D5fGXVerQ SHfg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=WAcdaY+h; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-537a863ea6fsi1306025e87.318.2024.09.25.06.39.32; Wed, 25 Sep 2024 06:39:32 -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=@khirnov.net header.s=mail header.b=WAcdaY+h; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CEA368DC23; Wed, 25 Sep 2024 16:29:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4912568DABC for ; Wed, 25 Sep 2024 16:29:32 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=WAcdaY+h; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id BACF44E0F for ; Wed, 25 Sep 2024 15:29:26 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id bbC8Fqb0vTyL for ; Wed, 25 Sep 2024 15:29:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727270964; bh=vZaVgFSliDB1tvh4c1ui1wDGjyr4qWVT1IJeByDGieY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=WAcdaY+hZtVHb8xN4TAZIedkajZIHOIo8TSaob+pxcMWKyP/dKBfT1RuPsl0Gjh4B UWwzIYSyqwxK4y7tBgoz8ue+5tyf8TJMlsWBn6Mhy/03mWS6LF7SXww5z3WC2ywkeo ZpsstTKl5wKt/br6n/E1Jzfq3fsa4DvnTFcC9ZRiMl5DYUuEKceFSYbNTERHiz2iiA t8pXNEESmClSSitAbRaBEM6K3sHB/JQDcAu4LhBJ5BdJKNsYhAddLPDckQyv52AJrU 3fIqrBxWyIUVs2yvZ8iXO0Mlp06NY/z0JJY0dQyjaDTLJBUC3i48dU8bnFt+cxhrHM E3punCliDK01w== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id F07B44E18 for ; Wed, 25 Sep 2024 15:29:24 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E1CDB3A17BA for ; Wed, 25 Sep 2024 15:29:24 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 15:29:20 +0200 Message-ID: <20240925132921.11203-9-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925132921.11203-1-anton@khirnov.net> References: <20240925132921.11203-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] lavd/lavfi: stop using avfilter_graph_alloc_filter() incorrectly 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: X78yPS2PSDdA See previous commits for details. --- libavdevice/lavfi.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index ce10d61f8a..17657a0638 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -249,18 +249,24 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_DBL, }; - ret = avfilter_graph_create_filter(&sink, abuffersink, - inout->name, NULL, - NULL, lavfi->graph); - if (ret >= 0) - ret = av_opt_set_bin(sink, "sample_fmts", (const uint8_t*)sample_fmts, - sizeof(sample_fmts), AV_OPT_SEARCH_CHILDREN); + sink = avfilter_graph_alloc_filter(lavfi->graph, abuffersink, inout->name); + if (!sink) { + ret = AVERROR(ENOMEM); + goto end; + } + + ret = av_opt_set_bin(sink, "sample_fmts", (const uint8_t*)sample_fmts, + sizeof(sample_fmts), AV_OPT_SEARCH_CHILDREN); if (ret < 0) goto end; ret = av_opt_set_int(sink, "all_channel_counts", 1, AV_OPT_SEARCH_CHILDREN); if (ret < 0) goto end; + + ret = avfilter_init_dict(sink, NULL); + if (ret < 0) + goto end; } else { av_log(avctx, AV_LOG_ERROR, "Output '%s' is not a video or audio output, not yet supported\n", inout->name);