From patchwork Tue Oct 5 20:53:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30906 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776218iob; Tue, 5 Oct 2021 13:54:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwR8RDf+7koWSdCzLnocooA/EqwqqU5jSmVdL1m5ymCWjLWx+GenSSRsePbx5IU4D3w+SmL X-Received: by 2002:a17:906:1406:: with SMTP id p6mr14092423ejc.16.1633467265551; Tue, 05 Oct 2021 13:54:25 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sb26si20127416ejb.542.2021.10.05.13.54.25; Tue, 05 Oct 2021 13:54:25 -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=@outlook.com header.s=selector1 header.b=VDcbNFPO; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EF3768A9C0; Tue, 5 Oct 2021 23:54:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072058.outbound.protection.outlook.com [40.92.72.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3256D68A874 for ; Tue, 5 Oct 2021 23:54:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LmLogRSCvA813qV86/KZkAMFEHCV8zw15FIX111uA6+imBfgi8rtthFDBxEndsdM+c2WL2Znhq3+VvMmMkA0GohM7g4GweHQAE3qGZu9TCusyUjxmz5MJBMOzVUPIQnMD9q0FUIh0IGqElid2jf69eI9xCZ7fuKdPly+zXCjh6hsomRol1OyWUYz6keOwvEETTV8yF/0tqAjYhq3K1ed8VFjvAXgDj3/yid33h9tm2pAs5Tj0cfDvEjWPcAnEXk5GbjczR//IkKH/6XKduLTnxGv+etjuolPEDqyIwroxpR+AV1V6jA6OPMwwvh1aBXWDbSeqrGtWCZQuz4X7cq2+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1FK/mg0MvqYjurETEPKZbZxPbkhSTY97nrLsIFdHSxo=; b=g9X664BEE84Qnc4TAAHJrtpD9EPHk+bRWnOgUjq7K6reuYeQlDHPAVos8KjDdXQV2p8wkCfAUuOVBlFv8901y5NKfkxFpY1lq0ksAzbSpmOB02/Oa1B48+5ilx4yq1YezXF3pFkOuIK6WY3kKYbRZM5/aD9PA3EqQplQv9UUaCoZ+tIO5h9hTxYrlBJQ/MfzJTwPUes+7TfDi2dEj6ESycQbIt15CRKigEwMbiBSoHZfb3tUpHgHBF1PhK/QpplbS/crBbe5UEmo+gHM+TdbjAIS0TnlmTi7x6mVphiqE3jILIY8uJ8kE+bxCys8LqiUhwSttUhLiXTAy2+I4VvXBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1FK/mg0MvqYjurETEPKZbZxPbkhSTY97nrLsIFdHSxo=; b=VDcbNFPOfPu7eFnx1VjWplYH09ffU5UF9AjyoDkcCnDc+LB02mg9qYQgM/J+IgSde6B+HoHHG7RBl4k2QC4HgFrRKPYB/uUZVVG7SDCV7+TQdNnu3ddjK/hHsLPZlDJqoOFCpXr7aRb4szIthzydxC2yqYS9OzA4npNp/Ba1Om2qnngLvhJoMEqnpen4S70ItHxw4H9loTKH51JMTvfzRIzOjCuGS6K3dy5N1JaqAKZQ/lg4UQZY5SY92Y+vpvlsawMrJ+p7edJpMmASLEXLtDPwzd0xbdaINbTfMYZry1FYb1POZckJ7JLUMJfyCwWGZdatI1LQEEpqdgYtMS6AXg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6184.eurprd03.prod.outlook.com (2603:10a6:20b:141::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Tue, 5 Oct 2021 20:54:02 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Tue, 5 Oct 2021 20:54:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GZuObuY8JFav7+5/+UnNcG5cowSPrsat] X-ClientProxiedBy: AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211005205348.519944-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Tue, 5 Oct 2021 20:54:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d15c53b-c497-4112-1ce2-08d9884242db X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWB1e7ZiA30a0MuCttbMdtXDk3pYrvejSlj9NlxPxa1xXu9NsvrIEOBinda1Kdtut1O4pae9GXkG+Vxmuyp/qPbY8bYtubsgidSoUi/pXa1gJ2RrdPNJw0NnAncWuHWdKmOCttluj47Skmr6sVgwtIRQRtrZT9JSd2e2TnfFadggWq22RbVObhGSHL0aB5XlQRG+bWhWsg9/LRK+6WZauH3eVyw+zqtt6NhHjcJ79KaBUMQS5LyWe3n9BMuFhB0MuVGryGPipf0xA5MkMoSXhmFgWyRnS6iTTauN63BgT2SRxYwRgAZpoSpbSBHjj2ASPevw0aPMcTNVGxaTw/SIzZGIu7dWLoPfx3o8qp22qz0t2f3tuKcKtIo/zdgalsZKxG9hfu2H3xJC5UCy5+21tiH5/NLK2yadGx8FjGuiiANP9Vb8+yi+6PmHR5Hk6O9tJ6QUaUMDaVmrGx6w4q735JwHTPaAZVYZs7U0IJzykjY4TIMhatNTCb4JKJXyP9pqmrg7LgFd7HUCzuMpNPrPZLqpZ3RWiYlnAN5EZXW1vQ0nZAHBNPQKdvzVqdfbuUr6U8SK+yLdXuoqnR6Co42Pb9aB17nEHgpmg9N+36u2py8foJp1YCx0nZqVmfztkU9pYeuwGILxe0CQv2WJ+/4Dr7UbsVguIkiJ6oqGu9hwS86NY3QeFjNn/S1lKmKzL4rGuFQJvaIH3N8QCPlTRCy2ADRa2n+r2zy+0Q= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1Jj7Rp00jLKc0ROEQqIJEM/0wjQkv5eI73SgDsIQlJhbqD/rq+jJH4uLRSJxC4HK1Yuci2hdBhBabaMyh4TYpEn9ukzn4+UHYkf9aJaIPDk1/VLWUdw2vlVT83WTYR0GWXErJzoQlIT1SipOtrnJBLL2fVkn1B5uRdaqACcaR1BdTjrCtnKp/bUeQ0TelXxKuq6s/hqpLhAsZ1nM7g9TQ1nKL6+1/ceRJBWkmi1oBLKx5gRrMUgd/EcmUFJRkFHHxWr4wVdxvD9urQUmIaop6WqVGiF2KwRYY71OU/SV+IrFafON9Go8K2g4e3cj8CGNUxAJN0Ai/VwD0ZZqstXi++B94EQNC37THOpfEsc1AFycncSmXsQM3Qf301J39jQ/iIcGv1du3J8J5e0EEoAePdWI+nVDFmKBpXvTeOdUiFwYIEs2qoieAcJuudKPdL7+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P3gIj1vshIrvNsonRjgUxkJjhTJWXs79fIEa/2vujW0DXWShP6m0fWkA3lPxSBTtEDjez8z/8eOKVSGCffhMYqrbVoNtNb6RopfyPT6UvNi7aLhn5D0Sa5DO0W42fh5PB2P7hyV41gc/aYMJQVYTmQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d15c53b-c497-4112-1ce2-08d9884242db X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 20:54:02.2402 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6184 Subject: [FFmpeg-devel] [PATCH 4/8] avfilter/vf_scale: Remove always-true checks 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YjN0ArL/kUjy Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_scale.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 5411289894..993fd18620 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -344,7 +344,6 @@ static int query_formats(AVFilterContext *ctx) enum AVPixelFormat pix_fmt; int ret; - if (ctx->inputs[0]) { const AVPixFmtDescriptor *desc = NULL; formats = NULL; while ((desc = av_pix_fmt_desc_next(desc))) { @@ -357,9 +356,8 @@ static int query_formats(AVFilterContext *ctx) } if ((ret = ff_formats_ref(formats, &ctx->inputs[0]->outcfg.formats)) < 0) return ret; - } - if (ctx->outputs[0]) { - const AVPixFmtDescriptor *desc = NULL; + + desc = NULL; formats = NULL; while ((desc = av_pix_fmt_desc_next(desc))) { pix_fmt = av_pix_fmt_desc_get_id(desc); @@ -371,7 +369,6 @@ static int query_formats(AVFilterContext *ctx) } if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) return ret; - } return 0; }