From patchwork Sun May 28 09:14:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp988448pzb; Sun, 28 May 2023 02:18:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55xIDEC05PD1K01TPspHG5nrXMMoy9LkaUtYCGXFroO1PiAGxc/xsu+A6toLDqRxH4DaIm X-Received: by 2002:a17:907:7ea4:b0:973:9639:6c0 with SMTP id qb36-20020a1709077ea400b00973963906c0mr7238231ejc.29.1685265480818; Sun, 28 May 2023 02:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685265480; cv=none; d=google.com; s=arc-20160816; b=mPNbX9yA/g8i5WOqluood1drJpi6FFTKbbIuniLn/XPy/rXkfGH1YKDa4OoOs43duZ C8eZoMWm361Dgid0xpLEf1ZopoG+NIr/ROA75Twhvrn2ZojhoMjNYRoOAvNgkQQpUwrM STIfnpNkR8rNIhqTiAptUXp6N6FO7Cf7WSoI4oX8Kq6jSDhV+mbeZd/1xE2apnK98nN2 EmSuB8VFDUzhaNvN1K0gx65DYpq2iLBw39H9gZ9/rpjBI3sy6cyav0iNeQuj1qMacfL+ RxnLPSfmEQYMcECpNjm/swD7MIYpONgMU6SMKEuS7d7U5HbbTEiuyDTurR4NagRfqyqZ zplg== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=mUMBBEDGseIOeOid/vR52D4v/El1IpnqZEVPQoQZz0E=; b=ViXi/NG+xDT+UMdxYsWnbiUYAnUvtt7QPQsqDRXTZaUnVKnRvv16z6WAg8Os1PmqvS kRb2y0t797reRIpLfGjC2yZrIrl0I7LzusEf9DN2KHXOBRVWKOUjJLsOaY/gWIk9wmQ5 Kk8ee8fnaho0z8my8/Li9uHegbS4W+FkL/7JABNoW9yTlgqJHY3QGnZLY6NLrpIOar+x hiYIucUyFBfckVHY5myPRxW8Y3ktIiRQ8VaPqlmlgpviMAfPxwUQZ7rP8wOAo9JWDlG7 C/a/M0Xr8AbmZJHW+fGH8Z8EwSBlbImb9p1ATGa0LbZ2kWYm4r5hlLikBj0GaaEdGA/A 3Xgg== ARC-Authentication-Results: i=1; mx.google.com; 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 z7-20020aa7cf87000000b0051425b17840si2975188edx.664.2023.05.28.02.18.00; Sun, 28 May 2023 02:18:00 -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; 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 B86B268C1E8; Sun, 28 May 2023 12:15:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB20F68B947 for ; Sun, 28 May 2023 12:14:59 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 792EF240177 for ; Sun, 28 May 2023 11:14:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Hyf1KDFiZ8zd for ; Sun, 28 May 2023 11:14:59 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id D97EC240D1C for ; Sun, 28 May 2023 11:14:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E0B053A0D13 for ; Sun, 28 May 2023 11:14:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 May 2023 11:14:11 +0200 Message-Id: <20230528091416.17927-19-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230528091416.17927-1-anton@khirnov.net> References: <20230528091416.17927-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/24] fftools/ffmpeg_filter: drop unreachable code 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: etnejr2geVlu Filtergraphs with no inputs are initialized as soon as all their outputs are bound, so this code should not be reachable. --- fftools/ffmpeg_filter.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index ce2a914745..e0843b0729 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1946,17 +1946,6 @@ int fg_transcode_step(FilterGraph *graph, InputStream **best_ist) int nb_requests, nb_requests_max = 0; InputStream *ist; - if (!graph->graph && ifilter_has_all_input_formats(graph)) { - // graph has not been configured yet, but everything is ready; - // this can happen for graphs with no inputs, or when some input - // EOF'ed with zero frames and fallback parameters were used - ret = configure_filtergraph(graph); - if (ret < 0) { - av_log(NULL, AV_LOG_ERROR, "Error reinitializing filters!\n"); - return ret; - } - } - if (!graph->graph) { for (int i = 0; i < graph->nb_inputs; i++) { InputFilter *ifilter = graph->inputs[i];