From patchwork Thu Aug 25 08:59:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp201045pzh; Thu, 25 Aug 2022 02:01:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR4dcbf9djQIXQC4pB9NejL1+mpZ3oM6/viGIM11/M2XKejyvh44BJRj/j1fNbKcXF2Nf8ml X-Received: by 2002:a17:907:7629:b0:73d:8d3e:4389 with SMTP id jy9-20020a170907762900b0073d8d3e4389mr1716974ejc.565.1661418104893; Thu, 25 Aug 2022 02:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661418104; cv=none; d=google.com; s=arc-20160816; b=k5lTrVaAi5VsJrbssCHMq9MOv+NZPehkFwEEegO+mQxecrdOmIHvdZwf3zqvvz7dDh pUm7cPtVpLE1rPVPEash27FO/ept9F9o20ItG0IH0wrOLLLSpl9IJwtixOYz+P+yvxVS eF2DZv21UgxFFHBMe0CdLJ+NZikRADrYlqEPvygUpj+fgtBYoJqOE5jVg9KKkSegnVVJ gJEpRixbudRK2bS1wDMICMqyq2ky6zvpCXgzwci7yQcqOHi9EHtZSL8SKc0LaSB5HLQr nVfzyrJB80ug9AdctND87BJrsU0AtRzjhmIM9MEbVfgAY59oP/F4fooe05bvwXUmBZL9 1KYw== 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=6Y/3Yxe9z9ibnbfvNBLJ/8+FIZD64NhXXx5ua1J2VoA=; b=SRlTWBD3ulqwzm76SSmOzRrrG+yf4/7j8WcPjys8HVRIh4O+k/ucOAHW/TcGVoRBDp fPuxjdPQF6iNybI0ATs20Rfexa3cxbmMCvK+PprytrCyLrvSIUZuZzicez+UedA5RU3Z n14SBTghFPovw+YoTZcJ721b0aCqkEcyHSx6SsearZ3m+OrHNSykdySnCbRcdTCERGl7 /GDIjaPM+tmY65iAE2OCYDjjSDzDqTee46YL+mP54Q0IInP+L2mp0fwcLvKlapgN873r fYXnhjJAvGJJ0izgHd91wxjGNsAu8v/TbzIdbt1crLqrgo2IdHkNUhX9wJ68McKCYhSG I/yQ== 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 q9-20020a1709063d4900b007396bf19f8csi3082103ejf.137.2022.08.25.02.01.44; Thu, 25 Aug 2022 02:01:44 -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 C3AFD68B72B; Thu, 25 Aug 2022 12:01:20 +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 8FE2368B9A4 for ; Thu, 25 Aug 2022 12:01:12 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id AB0FA240D1D for ; Thu, 25 Aug 2022 11:01:11 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id CxGQoY4ZBeGd for ; Thu, 25 Aug 2022 11:01:11 +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 F14A9240D03 for ; Thu, 25 Aug 2022 11:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 7BE3F3A0BDC; Thu, 25 Aug 2022 11:01:04 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2022 10:59:53 +0200 Message-Id: <20220825085956.4790-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220825085956.4790-1-anton@khirnov.net> References: <20220825085956.4790-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] fftools/ffmpeg_filter: remove an always-true check 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: PMeLVS4EvHQj ost->enc is always non-NULL here, since - this code is never called for streamcopy - opening the output file will fail if an encoder cannot be found, so filters are never initialized --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 4e2787eba2..e9479018e4 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -105,7 +105,7 @@ static const char *choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint) if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { return av_get_pix_fmt_name(choose_pixel_fmt(ost->enc, ost->enc_ctx->pix_fmt, ost->enc_ctx->strict_std_compliance)); - } else if (ost->enc && ost->enc->pix_fmts) { + } else if (ost->enc->pix_fmts) { const enum AVPixelFormat *p; p = ost->enc->pix_fmts;