From patchwork Mon Sep 27 02:57:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30598 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3745886iob; Sun, 26 Sep 2021 19:58:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0zygqqUyoxpIGu4YA9bUJjqF09Rq8EromzPA21SEmWVcEw3Lysp1wZiuDQonW292p7yEg X-Received: by 2002:a05:6402:16c9:: with SMTP id r9mr16111499edx.147.1632711511729; Sun, 26 Sep 2021 19:58:31 -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 g8si5911082eds.481.2021.09.26.19.58.31; Sun, 26 Sep 2021 19:58:31 -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=deBI+iqp; 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 BCA41689F94; Mon, 27 Sep 2021 05:58:15 +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-oln040092067096.outbound.protection.outlook.com [40.92.67.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5B3D689F44 for ; Mon, 27 Sep 2021 05:58:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J0zcKjibNnMo4Fm4OspIfkPrp8U8mcB6ZTEXLwWR5OHWmDnG4Mu3eGfdirbKxaxvq0DbMJc7FicyaCi9iDqcvHQnQXBGKt5/M+E4dIvLZbMWCvOeiPDT+3xj4p9b43+yNUI1S1x9i21PZ0o2ar4mRaS0/PJ8abs1bokPGTM5nRYN6PGBcwA/hG+W7lu1mqfmyDFzzVQitUc5ujVn/Z/ych9d5uMU6frF5MIuWGnRwmyfUxu/aOxolKdPUgid2Ojo7CMQnZALwAKjXC98duSsqcKDHPytgObd5ztj4PbNYa0dkqhmdp4/thaO8Ydyvm4Wrrg3mKgPYUYw/Pi/1LgP1g== 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; bh=D3mCFoyA/hyb2TF3Ux3BFmOupu0gFEFgHhwPH0iUI3w=; b=EVCIP27nSei9asBcN4BgdBZJMwZ/v2Yi/qpU1c9X3AYeU5KDGgsmaTIh5nkf8fBWiaWaS4U4ZwcVLyFgD83xXz/uuYrmP2gttNR7/vvfzVyXnIzf2GHhERE8Yhi/IxqLk/6Eh34cHPavCRNCLmok8SkP8INEeSn5WbB1EYB00RN8MCHvcfD93zFRMjB7i4Yh61uDDK0qoAsHL4cvBKyw1ZJo7p7aeHaceUaFzAjqodtQ1jxPk6Jo54gCecmCZNdY3ytd7mUXRYRLooGrpV3nYapXrQFcw5JZ+O67jXiRsGOnc7LOhQpCLmkmFtx16V6DfXm90P3194RPhX56097mJQ== 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=D3mCFoyA/hyb2TF3Ux3BFmOupu0gFEFgHhwPH0iUI3w=; b=deBI+iqpH4rkC8d4y44Zl0HsLvYTg9XqrzrA3MgDCzMX9ohfh9DhP4mCUI2FTyTbmgvChZgOqO2ZMkRK9YmU0DTNKMEMLeGgTr8bHq+gLWhBhB4T34McMZidK/mm7eQigRAvln0E5vW9/qLdyg9IsFnZnAverzBUsLkyrSrYlj3VNV3S8NEbRRswAZHR9iruOzopeLEyPtQCwPOHglj5QmUWZMNlalpBa74kvDGg24A+5CEI3fE2ztrf7R8GTOZhde1UpoeBJ71x8c4u+zDUHjPBEehXlpj26EOuoxuIugA4BDhrkdVOlk/0OLjuPL/N1Y4G/HjakABPbctI8UX77Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6215.eurprd03.prod.outlook.com (2603:10a6:20b:13d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Mon, 27 Sep 2021 02:58:07 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 02:58:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Sep 2021 04:57:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [QP1COWVC21tBbylKZPQBOGGk9V9He8jv] X-ClientProxiedBy: PR3P189CA0052.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:53::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210927025757.677855-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P189CA0052.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:53::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15 via Frontend Transport; Mon, 27 Sep 2021 02:58:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9c9f843-2b78-487b-4f68-08d98162a208 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WonAGWAYIHxzt1G+7yJjHj++iVFGA5lR1bVepSU3CWUxwJAMK8tSRahUjJH76cq3oSOlx3BSutwZ6XRPv3I6YfSaqytqN+xRsUOpRlxKcvIFNHyNVOw7EdLca8TuY/oAyQHcR/Pa0MhUElltTh3M1SmnlGgrNU0zxGUB5TmpswtlXSZ5UlM1gRc/mrK8vy+mhr9jQZ2ATavlK8yPBy3EyJwaIWH80Brja+uB8ddq2CiTbzrCvieqOi8Gwn+ocjZA+WkJlh3hcGoCz/CVC7XNzOrmkN9ZLyvtmZAy7WM21MaJtAciRFXS/RztH/QYBTuDSbe6MBu1G23uXD25iQAhtaKrfHjAzDx4MVTZRzZTPrul37tx/V578j0tHn/EipdL73rsSq6LlHc/N7AH+XVUBLpuvPUcVJ9oF5+QrQPTLx+geCYKdGUUriXo2wvYcaFfJJPNGaOkXApBqdZfqIH3DGYLVHoxGSFaXY/4/v7YjzHOV3pCjpMaQMKHtRJ+Lss6riVpvotEHbxt2iKwaNrvmOokRUIL1sbyu5PqswsiSFypQ86peKIwvJXgT3XL/piK9T+0QaxqhCax9JyU6XGNXzEr/eKI/XAbGitnkkLSVvL7pVpSks/FdOy9RYRkVl8j2t4fXFmkQl1lgnxBS5+LfEkLGRdD6G0MoVnseqwMphyfVJkOWF6LDeIKeNPXXENtTa8YYXRyflUenUpwaJkBdJG9XsSVrfhc2jZjROKFkSj8/mJomBrExUKJ047hnlCk/3o= X-MS-TrafficTypeDiagnostic: AM7PR03MB6215: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JlYBd6WVmkmQmyjJpoDa5Cd156YLCcapTTazkle/suE5yzZ3AyLjEez2qJa8XKkSyw3i8t99pfmcAk/HtOcoz4e6oXZbvLVntj9lTzQ06PC3z+Vv8PnoIK2mqNtgg5lgvNbP5gSccxt659MybfI2HelphkfkyMe1aHdoRol1Vci1Hu9+Y6HA4JuqAXsmeV87ToVkgz/WdqvOpP1D9ltBwJSeDArpugWufeLMWrQ11bEQcjB1MSAYIHVI012KZNtYMHaPsRXKtYpvzyLR2ql34zGYuDuL7E2JL9LXyMVB9KpK2tFl98GyUs6a7/IQ795zeqTqstYSgXpGo3JA0RqR0GDL6hE2vBwG5ZFPapzRpDHPetaN7wxXIsXt/Vdi7PTOMgO3qrcomYK3IXQAEVYYctoT2AiveD8cBhnAxUk6aBJmaWaB2MD/+7geFlvNc0On X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tKsRS36/zHnO0lF27pBSroqVN3oiAr546xeZWkvym5NN1MU4MuZz8VNpHtPp2NTbDUruIa6zR3SWN27sxEMDhCdVTP53OiG9qMUt7anjZ3PUYC9rVm3csDFQ5dHmAj8CIx+xyg8z120XOm1r6aQ6dg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9c9f843-2b78-487b-4f68-08d98162a208 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 02:58:07.7197 (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: AM7PR03MB6215 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/formats: Don't unnecessarily reget pixfmt descriptor 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: Vf9DC91b+PLT Signed-off-by: Andreas Rheinhardt --- If I am not mistaken, then the check for chroma is wrong, as there are pixel formats with just luma and alpha. The clean check would probably be desc->nb_components > (1 + !!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)), while desc->nb_components > 2 would also just work. Maybe there should be an AV_PIX_FMT_FLAG_CHROMA for this? libavfilter/formats.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 1d2a51c0af..29e318aa3b 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -113,9 +113,9 @@ static int merge_formats_internal(AVFilterFormats *a, AVFilterFormats *b, To avoid that, pretend that there are no common formats to force the insertion of a conversion filter. */ if (type == AVMEDIA_TYPE_VIDEO) - for (i = 0; i < a->nb_formats; i++) + for (i = 0; i < a->nb_formats; i++) { + const AVPixFmtDescriptor *const adesc = av_pix_fmt_desc_get(a->formats[i]); for (j = 0; j < b->nb_formats; j++) { - const AVPixFmtDescriptor *adesc = av_pix_fmt_desc_get(a->formats[i]); const AVPixFmtDescriptor *bdesc = av_pix_fmt_desc_get(b->formats[j]); alpha2 |= adesc->flags & bdesc->flags & AV_PIX_FMT_FLAG_ALPHA; chroma2|= adesc->nb_components > 1 && bdesc->nb_components > 1; @@ -124,6 +124,7 @@ static int merge_formats_internal(AVFilterFormats *a, AVFilterFormats *b, chroma1|= adesc->nb_components > 1; } } + } // If chroma or alpha can be lost through merging then do not merge if (alpha2 > alpha1 || chroma2 > chroma1) From patchwork Mon Sep 27 03:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30602 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3746930iob; Sun, 26 Sep 2021 20:00:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWAKveMHXLXI9SM9kPQyhFFMwhS+8ZT/InH2Y1zw78m1cgMqwVLBfWEa0n4FN3gcBXI48a X-Received: by 2002:a50:e04e:: with SMTP id g14mr21440563edl.168.1632711622395; Sun, 26 Sep 2021 20:00:22 -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 zm3si7751493ejb.753.2021.09.26.20.00.22; Sun, 26 Sep 2021 20:00:22 -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=anWl4PQr; 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 0173E680867; Mon, 27 Sep 2021 06:00:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074109.outbound.protection.outlook.com [40.92.74.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E171680867 for ; Mon, 27 Sep 2021 06:00:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KqyBDHQfGRuUOyA+EH1n/vULqjqltlY6xxGiuBbZWufBChSrAwpGbRRWvoxpnZwbf3SSU+1xOGzKbPoNCRvb/FMMStkE36CuODPkqBj6Vg4HVU9cZHXw95C5Zyvyje6GNsrXDlZb7IabSRNhepkjVZXmsHcjV+/dyMozwslhTV+meyPwksmlW1jejKB+sztQFDUlARULnfpIb3YscIXDGBYcTrOp6ObnmFx/ebVf3ym27999/5iDTon9IeC4XBBvlqRL1ixIU8l+SAc5Zp+z6TIB0I7NsrOvANiNNnFiTSejvFCbFX7BbyWnQBMpLN8iickRjRAThiIi5wCfIZuqyg== 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; bh=Mc0Ry2cen1u0Su0jnCXoRgcy81fkDUf1NN8mVIFJvNs=; b=ZClcCNnx9HeyMwbrJ6QkpEbxQwODLydh7KwEJJ5hy++30SO85Ys1LKki29xuO5bKGcVhmNaH3/44NV3791Iay9FtQ8LcWOOgsPWt9GQiU7WL9t65tu9G8CyRVz22/+PG9ktXLvshERgq4RqkoBWcxEKi/KwUo0nkWRRriiQZyHWrNl5dl58SOs4hajYMHxhkiYsEkMFIZ27fH1UmnaMkirQOS7rWxwkJcDiTO8ieNupSgiKafcRPIz9BfoqSYkS8i0T0CPyU6kkmNOLKAnfPcAaPSkuA0OwaMZYll3xFdXKz0A8Z46wpwEhgX/Wenp6k9LrlhwwYLoPQ+wz1ObQhFQ== 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=Mc0Ry2cen1u0Su0jnCXoRgcy81fkDUf1NN8mVIFJvNs=; b=anWl4PQr1RT/n3askUfdWVzUXs2rgGoIZE5VxGtFK4my7bmXo24OEkglLMosKbAY+17zxd+jO+4EEPl35AFegR61t5sf3FpADoi+pxV03X3cqaBr2A45RhKjbedwCEDUDHncNsHQ9wJLlvQJ/R8Y9y3UU7pqSQkBb2Sx+KnlaQU0XpBpmFFHe26ITSanIlMAscP9AvSBew1gnf+8lFJR/KII5uG+FTm+86Ov+5Yyj6X0+4hiZcXKt/kS6Yau0ch/8P7AhhZef3QaZwtd7XBcy4kRW1UlXATIJ3kxl5TKek/n9oaqJDO8JXhx+9Mv+uTYlQwJ3SuvZ1FFRxk1sLQYsA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4613.eurprd03.prod.outlook.com (2603:10a6:20b:11::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.21; Mon, 27 Sep 2021 03:00:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 03:00:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Sep 2021 05:00:01 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+JwJC6eNnu6IWiRyPLgVNrTXN/Yvlld3] X-ClientProxiedBy: PR0P264CA0202.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210927030003.677961-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0202.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 03:00:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f414654-e506-437c-1bd6-08d98162eb93 X-MS-Exchange-SLBlob-MailProps: DD4MX5oUjaKnI8fkstXk0uRUYAmvs/FNJVp7Ivw/F0BImDVE/AbOB0ozBbfJcUmOjyt6U21FLEaH4PZQwPDHBPuTsJSF0NpVaSlw3/YnacjcHGWpKqkXEhXfsEnb+RLERh3EYQ4qI987OpvCJ9Fi+wNrsXcqqJEzjvrDgW7lWTLRak7cpsbYGVpEwswpeZ/KiojNKpezlPAiMIYg7K2jG7zfts7gyq7px9R/n8f2dsUlKDvkVCJU4oeeMgbC2/UL+zBV0yM0s8uRCeW3jG03nMqQSewEMYoRmtWt/Q8JUAp7SnJRThlO1tm0zf8sNKmdAyRq+vDFMqcbci5VS4UImUJ1IiegMwnD2iVsypXikvl2iLxB5bR4OdHVKa5k/wJmCRBGfBy7uDzMqma30Peyz5UMw8zj5gHLqnq8IruTVpG4Wb59npzghxAa0cICdb7BMxEt8UD7R04ZfQCYalAAm1Nw8wWfTeEj39ZXOIx1QrcXGEmbGoAsgcq1HdbzK4TG6aGIEofK4qIJ5RjSyGGYkburyJHXNYD4+hpRghpUgb6Z8jAzm3PgoGg1nfT9riBkDUuIER+uBdfSMxtKqSQXJCMPtDakSDw6ry7BaKvXs58kWfiE6B1hf1l00aAsS+sj4rbYY4N0/KaNHRTbkfjV57NmhTqmQmv2MzFsSlhNlguYo0f5kWmfqg== X-MS-TrafficTypeDiagnostic: AM6PR03MB4613: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /p9a0rxdo47CH86CwgCFnMX/peLfYfLa3xBcKoDTFLRd6BPgmAFl1e++TDZfVDJFBSz/5Cdo/GZJFYolQo7D1oEUwqxy6ALr/1MMmGTEG+6Yotd7mwphJZtDcLqrqSdbcyMpu7DWqdsFEBCSkr081ugMSHjWH5yNK4Z1PS9cC96xL8heh6Ck8msZXztpu/FvtO6B7U8w4DY6CJlsfzS1Djp9bYWwW9O2YymNSI88vzsFshcHIgGJaqbwxl3ttWMhT9/NqGJ1oJcO3r1mDyeB7uP1zdlVzU4ISFRe6J7u8A2au0B80iG/fO8s1oaskxTx07SxKmRRS0ZXt3s3fWuL9BZkXoKFvIkLQ/Y0PR9BySaqrCX3xAODRI2wioDW2NS7b73lJSfv9bsSb214OCj4+yAZXASG9URIdtUTTjwOYBCIiqDGiss022JJs4yDnKef X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BrRhfn7k4ppOj19Ocv6uTHdllE9bJwB6b1xx26IVrhovrdgQPIKvb0pvDJ7e9KvryPHFp5RYSBcviZM9sPkOYTaLJWfRk4vbNlBnOfMsvYUq9UcGhPiBOY05OKJDaAJejdBf8cDmBew6N4HrrPxVPg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f414654-e506-437c-1bd6-08d98162eb93 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 03:00:11.1139 (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: AM6PR03MB4613 Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/formats: Update outdated comment 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: 06DVt26pQoX+ Forgotten in 06754f7bbf341062581accc27b5cce353e99fd82. Signed-off-by: Andreas Rheinhardt --- libavfilter/formats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 29e318aa3b..ec3b8ebd8d 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -58,7 +58,7 @@ do { \ * If check is set, nothing is modified and it is only checked whether * the formats are compatible. * If empty_allowed is set and one of a,b->nb is zero, the lists are - * merged; otherwise, it is treated as error. + * merged; otherwise, 0 (for nonmergeability) is returned. */ #define MERGE_FORMATS(a, b, fmts, nb, type, check, empty_allowed) \ do { \ From patchwork Mon Sep 27 03:00:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3747017iob; Sun, 26 Sep 2021 20:00:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwzAj3RmcHCEtWx0TdtxB0O6lEO+VbgfWOS3NJTo0vcZ548FHWsgF/1gyCFDI/hWQV8uOW X-Received: by 2002:a50:e142:: with SMTP id i2mr20526569edl.107.1632711631205; Sun, 26 Sep 2021 20:00:31 -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 i14si15982329eje.573.2021.09.26.20.00.30; Sun, 26 Sep 2021 20:00:31 -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=N9G0D4rs; 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 0DA3468A009; Mon, 27 Sep 2021 06:00:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074109.outbound.protection.outlook.com [40.92.74.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5F3D689E7C for ; Mon, 27 Sep 2021 06:00:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E+O58UHPkxTTLbK+Xri8OQfNxjVvJKfCX365YEL/Ye4yDmqTAxQHLi5kUc/wb6xXxRRS5JM8QV1jJwZAwQtUok+YSczx7Yu79Ll7/wKg4Ar+XitjbkIMEqg6RPTGHgt54rAYy97tKeWanBo6RKSFWkZL6Wn3XhD+we2Pr6/tMtn2zuHL979CuCMOny1uC3zWLB+g19oq47WI344R9C3OY+AfbHrIa9Qt7cDUNjaj40xa3yvNRX76ioUeesqxsqN9g/WEc5x33clZRrj6AwMUVQIyn6ZKKcATAlKnYrCkQA8MCZWJw5EuNSYTPtcrQwT2kAIO2tiLPqw8a0OxecKbYg== 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; bh=BhWB79Y57jLD2wm5tT3t/qNKu+IBoJfwOl2DidjoKyw=; b=PRPS54kKU91SrwC3t37E/BRDCujAdvfQ6vSm0pd0ZwXe3SO4oG4Hs9E0laXhrbYt3jrR4Qu26RoW+036gfaz3uTB8FHIkeD+2XUGKOpgBF2s9K26bDSMGO+E0KagQhAcfNqZXVDU+DOUzOh+NnBJn6WVGJCiFSuRe9fFewDkgXhltOQg4uwpl+7smGxTSq8jsFMGSdwgfZB/3LJoay0a2mbkT2ICUA+Ki/EBFpWnQSb25KvaBuEoxu/Z1M0N3khJaz8rREtuyx1XOWdcQ2AU5iQfOQ8EUptA2w6I8Pp1m7PMyiYyoz/3DqK/ydizHHvs5N7lf2NjPrHJOJWwY4a18A== 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=BhWB79Y57jLD2wm5tT3t/qNKu+IBoJfwOl2DidjoKyw=; b=N9G0D4rs/YD0NgqbMzK28mTbJi9O6dFSdXr06w+tiMK/IHwR7fSLFFBHnliABtfymQuFXqzli4byzM3oSzLD9uMPoAELIgW3SzWp2vbCGNPQx2vYoBuF9zWh0NmncTxPejf3bXDoTcS3XjR4ky7dK0S2icqjC35F2szUopWQD915EHfMZCBudK3QFeOiGbTqNGrzHEDOUBrvn0g6luVeFxQBaG/dNvWWdA90Ekue50Zfw7BIsIxZ03uSGOaF+Izut75QjHySphiXIN7NKwBgzfhfgytGR7Hh3udsrpR8f1N6Pq40G71Cpq04wAoS/09y504r5+ZM4mHfd4RxqV0Dqg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4613.eurprd03.prod.outlook.com (2603:10a6:20b:11::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.21; Mon, 27 Sep 2021 03:00:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 03:00:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Sep 2021 05:00:02 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [JIoY6sxhxpIyAVsv33Iqy9Ia/sUD23qK] X-ClientProxiedBy: PR0P264CA0202.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210927030003.677961-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0202.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 03:00:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dae8e0e-8353-4325-4d08-08d98162ee5d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIAJF/k4bgfswhL/D73a9vo8O50bDtvFVPgzZYuMASK8mXvvGGOjRw6xzRGncjrXFvguKJsNrDur3KiBq5rgEbcenAmXM5bSaJ/FUNmkZbRDBSGu2VaTByWsN/Ajm54rNfV2t4+/eVZOlwj3iezPviESHLq1Z0n42eD+tzCkxNNSzugTxqVbGNG6l6U3wUSFVXnr89PgvmfHHYZ0khsltaSgAmumr9JYPgK5NLmKSWTtEg53nAcBsTHAC0Q1WiDB67ZdYt/op3qzdr7r1A6sUJs6BaQ4OK0Apugl/e1Gtc9770rFW/0XwkiZgYouw83qJZfEaUPdtf7NdMIRglAERgFZsxpM8QhXO5yx0xTO74JvxBompVodYP08mzoqCbst3QOEi8ejnOsZprUtd2TzA9y2hne1pBgDDUTX13LtqIq8KaLvidhZJSqLTo6LIbqpA4LK9AOeaJF2YIqYPtP+3SnJgRRAnv4crcFKsVUYexVuokgcdFIteQq4AlvTW7t1cgMjYNGfSrj8wSPGH5ww8ogaLCidZOtN0PGSQNz/AstVR6HHhdQRqeZYO1EmRkQc9eXPCqsdownfjcJfi3IgML+yf0ODl+ONZJFdEI9c0ZPJVb2Ry7b1hWH3i+BCPRkBBwwn9VRzchZkrMeI6Odaxo6XVTZAnJi91xK95pX7kc2HZhQ2FomkO7HGqJhLXLDML31NCN3zlXRjA== X-MS-TrafficTypeDiagnostic: AM6PR03MB4613: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gCDX73W+/L0elLE333RGL8DilCQE68wAYP/S8Rg2iZO1AyOSn3lQLPYF82pkwddMRzxzjNydX0rlGpMyXuymr/Urrbw23ykvD42i61ydzt1Q+zd1rmY9qUOCyiw2jU8ZPxsdegqSHq5gXSZOsJA35IgpD2Hn1U3ijic0386mDsvYCg91D7gjIZSQAPbunxDJjMcP37/8gfe+0IyYcKaeElG+9aFLqNsDV5Oz7nH+zCUo4eZLiwEv8fvpIKx0Bka+p4WmQNvu7EUNGFj2hiG0a90VUeXfLpx3c72wtkEvbMkbZMIXB6rAW+/wsYI7CqBizErvI/ReRRL3yZanq/dfeCafhYH5pzSyJiG47j9I2cn7+Q2kMtejB+5mvctu99cMTZIlnk68qbG2OLxVeLaiFGtKgdQA2eNS4ViHvMfwSiS7hArFv2oYOLkYq0/oIDV5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aRcq8gpUuyGyZc/LgfknGhrrfGK9EC1NLVUC9DuZUGLytFdI2smT4jlYSqryapYhRaBLQnZfFygztsHsWTTHH+e84ZjiDBGzk/o65epGDhI4n6AJiKdelnoNnZcB7ZFKhK30qT+/iTh0neo84+qVcA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dae8e0e-8353-4325-4d08-08d98162ee5d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 03:00:15.7487 (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: AM6PR03MB4613 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/af_afade: Remove impossible branch 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: 0wbCYBPgXDS9 Also don't call ff_inlink_queued_samples() unnecessarily often. Fixes Coverity issue 1427665. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afade.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 3bd0331e77..aecbb44f70 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -483,20 +483,18 @@ static int activate(AVFilterContext *ctx) } } - if (ff_inlink_queued_samples(ctx->inputs[0]) > s->nb_samples) { - nb_samples = ff_inlink_queued_samples(ctx->inputs[0]) - s->nb_samples; - if (nb_samples > 0) { - ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in); - if (ret < 0) { - return ret; - } - } + nb_samples = ff_inlink_queued_samples(ctx->inputs[0]); + if (nb_samples > s->nb_samples) { + nb_samples -= s->nb_samples; + ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in); + if (ret < 0) + return ret; in->pts = s->pts; s->pts += av_rescale_q(in->nb_samples, (AVRational){ 1, outlink->sample_rate }, outlink->time_base); return ff_filter_frame(outlink, in); - } else if (ff_inlink_queued_samples(ctx->inputs[0]) >= s->nb_samples && - ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples && s->cf0_eof) { + } else if (s->cf0_eof && nb_samples >= s->nb_samples && + ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples) { if (s->overlap) { out = ff_get_audio_buffer(outlink, s->nb_samples); if (!out) From patchwork Mon Sep 27 03:00:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3747091iob; Sun, 26 Sep 2021 20:00:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZDYhk22iqrnbr7xPmGGtxReyi08ShCPkw90FweaswytXvSD4X/q2RbyNp+RW7r7RcKO3P X-Received: by 2002:a50:da49:: with SMTP id a9mr21150937edk.281.1632711640003; Sun, 26 Sep 2021 20:00:40 -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 r16si3638637edy.214.2021.09.26.20.00.39; Sun, 26 Sep 2021 20:00:39 -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=RQYAolIt; 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 0DEDC68A22C; Mon, 27 Sep 2021 06:00:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074109.outbound.protection.outlook.com [40.92.74.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8EBF689AA6 for ; Mon, 27 Sep 2021 06:00:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q2IJxlJVRgd7Hc1tUCqxKn6Z1ytch+O+WtnhZZ0upSUUOkgpyKLicwBEHALruvQEsLX4k9xvvDNH9xOJLKzNAhRI3Ki4qPQhoiklmplEIWFXWciBy9YP3eyy5BozXLD+n8qQudy33EKlvzit84OMLIrvdkMsay2XN0RBnQUuhz5PcGHYQi1alp/rYHQuDjtdjbT7rDPtA6c6Nfede9cLKSjHuQFS+k0NgL9DIQo7N425irBalkio88Qd6K48vTjZm4nxI7AhZTQOtdwVdpo4+hrm81RGEYAZQm3OramCTldHrsAt2+IPqnhGKW7BlxD6c78r2fsK1PiFLuT8QubCAA== 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; bh=GdepNycJ4jKKx3r/3A23tiP6GPixDHaHJCbjSmttM9I=; b=m4DzFntHOtJENCJ7u7RdCk/HVDZ/rHJuEi9M1EB5I33c5RDKcLkQH9a9zRfgjO38yLHC29ZMPSQB/kD+bgtf4Wmwy5E/KxgWLpqWy6HO7TGH0nmovtBAvRDJ3sI3qC+EAJ2b73X6dxiH31qTQgkeVrer7vJAxG4VWvHKcmb749zC8dJvi/2sPoQab69fXgOO4X3ckGSOfqYLwHaPPmA9AQJh5D8R+z/MeMSVDyRrO8zKK6iqU4IP1EQDXWyAMQ55y201MQQMG4TnfsEEd83Ce5Ln18AmFjWlJY8CbufiTfMuxS93tdLaZOAFTQN7XU7ThH5cGK0kNRZ0iu9B/vSddQ== 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=GdepNycJ4jKKx3r/3A23tiP6GPixDHaHJCbjSmttM9I=; b=RQYAolIt4v//RLWEsPn8bDqDZvNvhfuh4fRz0gpPMnsYKabpNDNUoBH5XpqLKgUhzw2gW6mPYGl7QhTu9KvTUuRUagf552w5++oUWgcUZRBATBIV6qHbsJ6RdcVLe344lehECWCHbGsTs/jw8L7RUHTCtWOxuP9WtQ0QMaidA4baVBbdk3hjzAddMs2M8j/asYpUCPyVZ1dTl4wPi1jeyW7XMddMhoxai+fvdymWm/0mWcgNhaWkF8hmr0fiRh69ncEn0m4hWwqsbS76RVlmzC9IUVmRqBDnZWvCjyXjvSEFi4eHmHve8HfdAwPgn6G0I+NH6pGskbQBUNFrAxYXag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4613.eurprd03.prod.outlook.com (2603:10a6:20b:11::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.21; Mon, 27 Sep 2021 03:00:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 03:00:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Sep 2021 05:00:03 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [94R5j0mqQNeM1uCdygbmRfNY3SrhdXdv] X-ClientProxiedBy: PR0P264CA0202.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210927030003.677961-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0202.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Mon, 27 Sep 2021 03:00:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9599774-e298-4f51-a2a9-08d98162ef1d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98ZlvLpSB7KDhm+1WsT882/9MIqzMsJswzsuFSONaodHLZ7vtyE4tkkshRQUFOajGXeER0LPTayiIZnrdOK0zbXFYR2jm3ve8MctziwjMAFV2yBggvhQIAttZbMENaAwyZJJEszyCGAwbc4cTVKDTfW6oK7G1nYYilS/6Q1AGtOT/KsBpFbE5xGqEFLRNTwXtOJl5Xy1QYe1Aa/VzKvzkcOxQboHz2wfwx9nMAF75WKoIccv31rXbzmFZw5T0BU38BYJ5FFO/SVm+1XHbOdgSxhgs3H5sZfbNNEItGYXT1PaqbD0NARnCRdrphwoGpIVLAtJqLApWUM6x/ja3yhaYDcaC+bmUv+aTfxY/3h9GJZmTKlbPTv9RKyXnuR+Tg2t47uJ1/1SKR0ixNT6iEd5Nbbt/34l25kQVAf4qNuXtZpf/EWR+NU5T10UaibKnXPJ1G/pzpsMZB+D6A5Owlh2rsiWzfsDQKP09VLY9uB4pSGoKNQQtqYV2jgIPuVGMCiUMj4631AksYic2Kr5SYWeLEkwow6XvyAMSO0VJptBdYmXwU2nNeVwiVXBofV2eC6cdAdOikDCyqc3N5aDKyH3rHpue1DV0h97IACuO+YlukY7w5kVH2pw7kEvj0BHcDzDP2LTXr9NJI5/2ypdMTYyUvACdjLtDRUapu0wsA6CfxXOoabDAjMh+ysTre82vy9upiUK9Oyw8393WdjEahKSLVDElfVBi0ioQYvbS5rLT8co4QftrUWR1d1Y= X-MS-TrafficTypeDiagnostic: AM6PR03MB4613: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WXvBgYaXO0km98zdz1YY2yGyrJOQwoZpXbt7p75EagKb93IcM8VQed0VVpSRRbofQU/TEs2khsamFZAhMFQCiXwNw8UuvGDFjjGVqSWhWGMq8EHZQMvMTGyW41AUWn/iellfMyHoYN2Bnq6trH8HiEkerPcT8FPsTaldqKogt1lVetaGR9otVZ772l2aKeeJXxz9g2G2lMPIVKwcPiHUqzenp9W6I/X067m6e3einAC+fpMQMqzt8zm3Klx1G34ZYybZNCkx6bnsqmex6ZmMKlDEF9WKLsmPIaBk35rEvpFmulbJLD+Cwmm8hdjI2HOKpQWsWJrQavZ9/rW6jEZt68ZQpCGiHeVCXv3HVGPYhvXO8dj5pxD9SV9osyTJDBZ+j3YkBUenH9jReJdhWxH89osxSGE1vDEWyDDWImB9V364+7Plwthlld96RgQ1MAWH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nbnxtmYdOto98elLlOUlbqtzES1eWdHVoJITYfwVmvsDnDCG7UMcLzilQXic207INFXHyaBDOTzPOW2D/b/vTa9C0lf+JUWPURFYUICHrLYVR5uIie2uoa1l5/WHvqtYwTBYrsymq4AlHd4tVCsqwQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9599774-e298-4f51-a2a9-08d98162ef1d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2021 03:00:17.0301 (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: AM6PR03MB4613 Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/preserve_color: Add necessary headers 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: Sl3BrWBkCiwC Fixes checkheaders. Signed-off-by: Andreas Rheinhardt --- Will apply this soon. libavfilter/preserve_color.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/preserve_color.h b/libavfilter/preserve_color.h index ac0587ad1e..158ee226bb 100644 --- a/libavfilter/preserve_color.h +++ b/libavfilter/preserve_color.h @@ -19,6 +19,10 @@ #ifndef AVFILTER_PRESERVE_COLOR_H #define AVFILTER_PRESERVE_COLOR_H +#include + +#include "libavutil/macros.h" + enum { P_NONE, P_LUM,