From patchwork Sun Aug 15 09:55:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29528 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1104177iov; Sun, 15 Aug 2021 02:56:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztHhBU/xAVzxI/O7CQwpb60lca2ngpX2znc8k8m5/DrE75/73Cozy27K39RaLpC+RWJ50w X-Received: by 2002:a17:906:3bc3:: with SMTP id v3mr10874568ejf.482.1629021407080; Sun, 15 Aug 2021 02:56:47 -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 y2si7189737edv.102.2021.08.15.02.56.46; Sun, 15 Aug 2021 02:56:47 -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=ITkRdagG; 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 5427C68A0F9; Sun, 15 Aug 2021 12:56:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067105.outbound.protection.outlook.com [40.92.67.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 10C1968A0F9 for ; Sun, 15 Aug 2021 12:56:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eNZ6kwaScUmGdwd/KVFhn+Pj0iDeha0elwafjzxG/1BYlgfwkXeuFCLIwO0WysjNVZTBgeaS/1EMnndkEe9bICOolBOPba/DGjfo5Fe6QGaqIArOLJSl8H5LF29AXvP9tbmZFHgSiZAit5DL0mawEqgS3VppKk4GSQvCn7uGIxyb/d7WDwwC57i1timXIBmRY8yswUK+suUY9KZyrzdr6jvz3Q4+5JzyuWeS26+bT95JigDGPTt+vJJ23pnKmka9TAAEUmFNsZJGXvABcsXxAPXtY3PsBNBF0a+lNF9Wb4OGYcSS0QI42EjNKYTdxufy2KZdmVp9I2kz2dMyj94D0A== 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-SenderADCheck; bh=TNrvDu3nhvzoMoy+08PBLLh2sCUrKJrExKRRb+kKA7w=; b=Oe5//ypdpzd0baTRY7N4urAkwnsurfaxAcvkjXEjuWJFcqm3envZ4/v681thHYH3lXMdfTTThp76K6/i9Pffq3WuvScHf72V+sHlDDl7NZKBAorI445Xt4WsrKFjcwixUnMDPfMxCyFtenG8vNVyMhPKSYlZfrBt+/yReD8E6rWXJWODK+tCs4Yt2qypMulFPNREZxnnnmugU73lGx8xfsGTQnD2x4pi/FbUS4mD4JMh60VkLPReIuGo6FP8LB0yHqNKlANZRfH8GGbmztp5NjGH+9VnmIZxFvtwcwu45TZt0M+4xFzwls17SjwYLgdhCryx9UfCsWnzG0f9070lkw== 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=TNrvDu3nhvzoMoy+08PBLLh2sCUrKJrExKRRb+kKA7w=; b=ITkRdagGofH09/eh+okg3I3/68Dv3ZMbXYJp/F8nCCkn8Z/2foRm1pwlpyID3RWfBTKS8ecpzMVKMny3kAi2kX2l9Zk3Vw8jIKxgmzenRgWin+jd23yZwvtFnfugORvVlNi3grxNJKQi0TcPkD5bDJOTm0e5/iMmcyf0S7NxkrnGBiLsEsIMajZ5QaG8Y+3oOyEgqueHjBYnCGf0mhNR+Yckf1vpC4pSaGW1457WSSvORUI541BEiL7Oa27gwEuI1WXWztNOrS0HxvI2Xg3XOPjW3KF+mGv8wduulWRbQ4z/rzWmIRpdd+9pBRPNLODMUH+THBOgmakzsRxo49H52A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5542.eurprd03.prod.outlook.com (2603:10a6:20b:f8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Sun, 15 Aug 2021 09:56:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4415.022; Sun, 15 Aug 2021 09:56:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Aug 2021 11:55:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jZko6AMCfv2utU4C0WAfUDJ7gRhQrovD] X-ClientProxiedBy: AM4PR0202CA0005.eurprd02.prod.outlook.com (2603:10a6:200:89::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210815095538.2116202-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0202CA0005.eurprd02.prod.outlook.com (2603:10a6:200:89::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Sun, 15 Aug 2021 09:56:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 581c1075-0c80-464e-0beb-08d95fd2e7ba X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVjun0oR/i13HcFhFL6IneNKWxHkS/HhJB4/cELPESPlqqnShd5xhh6liv9JNqjq56smGGVViJp1rbkTPsY0qpEzu9Qa0G1LmNcsUQCM1hubCIBjrTatticdxJ3kICH/NJXCul4xCRgIYXNkryq2rqHgVkrfKPZrI8ltglUw8lwqKV6qfdzOOOQFijU9hVAL1Uu3bAnf5DzKQ4v93F2CBC4jNeEfu8N9e77ylrgbNJPhV/hKQWqq5Cs5fIckfS4vsCrkWSqlsZUqpY09YcTq3KZ+Ngy4Et74SNc4J+XrcJLCdNE4uC4m7hw464Esp3bYW0M40JzxSktA4yiVZrpt7v49a1eGxOpLW0FTAF8iDCi7I0tJgXklww9Ejy0vTm8yMXrXXPsPem++8hXkY8bIT9YjzMQ6W5bT9eyKla291acStveI/5Q1TZd2yKI/Ni4U00rzP0bmLh9vjiA/y0zbP+o9E6Jl1wNA/YOWhEaligbNHFyzQl96YxrshrhQkTavR1ObmbVbhfnhAo/5dIC1rUW6IE76SMqyMYAaT8H69EZk/maN+jCopveQliVGT84v4PD/O2JYqBmVOD/tqqzt7lTcv/UhIjcM7RKntLJyMSVFiI7kWDb1eWvk+GwOL/5v9HUwWefr78b0CcZ9El6oR/th2ny3MWVTNGAmXlxuet24kCrp25ZB/4dHPWoN6ag+g00gpnqBxS2jWMkOTC5MZq9RkwarcuYxps= X-MS-TrafficTypeDiagnostic: AM6PR03MB5542: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWh1PalzRM6P9SeQQOjr/mKOcva4BJGwZWJgeu6cZRdSLLb6vn3BXhlR/+rEbczQvnaNmsol0iqnl9wvGvdWnepfv62X25xhhAmJF2Re+BsFsBxV1jntPawJpQ1NHc10nUHcPPT4kpA033DKU2fHKPAjb6Y70XJsjVdeOAcQFHoGUEaXNyMZK7IZJT6PCD7gBu16Yn67Eja7CGJogAjqfvXLafLI9348fRFlAzwbQms0LJ9oxNoIjivYWY2h8c/ptd9Qy/3K+gbHe1fupbw4TOOwCbfc0mrEvToNrNr/EckMUZWCaPhl6FJP2g+Mcwx3u+eFI3xp6GfQmj3X9W66J3xnX3ZKbUYo1ydvIzcmvsSZrFqH0uA+pMbQKrBobVfiiLZE/eKmzVby11UwkLJxHAlABoFBYt0kNBUaX/otxvbKvD43NrvKoq1WU1WcvurO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fHYx1aOw5S+v+k7ROOyvQjpvgytBJwC3UvVtdcpalJMh1gHpb5K7fhn1DrxfmF1fwf1w8dQ+CMpN1i/An7xCop8OsENw0enq2msU6qyTpcdztJz/RKLYy4kXnFhI5CTsMqqSj0pbkhTcGNFsqtGOWg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 581c1075-0c80-464e-0beb-08d95fd2e7ba X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2021 09:56:08.6948 (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: AM6PR03MB5542 Subject: [FFmpeg-devel] [PATCH 07/10] avfilter/vf_fieldorder: Simplify setting common pixel formats 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: gkN8YcLMV2gp by using ff_set_common_formats(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_fieldorder.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index c045d1634d..d34119c920 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -58,9 +58,7 @@ static int query_formats(AVFilterContext *ctx) (ret = ff_add_format(&formats, pix_fmt)) < 0) return ret; } - if ((ret = ff_formats_ref(formats, &ctx->inputs[0]->outcfg.formats)) < 0 || - (ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) - return ret; + return ff_set_common_formats(ctx, formats); } return 0;