From patchwork Tue Sep 21 06:20:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30398 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2133261iob; Mon, 20 Sep 2021 23:21:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbokDuU9Xm+5lTG12tM6dZCMkVPlcEMCo+RXE3jZqoYYpw7hgLYPqdJmflVucXFw3hhiUf X-Received: by 2002:a17:906:90c9:: with SMTP id v9mr31440878ejw.356.1632205294292; Mon, 20 Sep 2021 23:21:34 -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 c10si565426edm.600.2021.09.20.23.21.33; Mon, 20 Sep 2021 23:21:34 -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="MAg+/tjD"; 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 AACA168AEC9; Tue, 21 Sep 2021 09:21:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071064.outbound.protection.outlook.com [40.92.71.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CC8E68A8FD for ; Tue, 21 Sep 2021 09:21:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XM0h3BPZ7aHVrO9KUduqcxy7N1sFo3ilWOP9ZHjgiLfyiCOCXvRnrD7Pbw0E1eV6H3GCoh3c4KWxYpuPdovwjyfWjLVbb5c84rVOUC8QWjFNlW1L+PyWV8UUaUpKnSSd8/o/c6ESc21PHlPLpa/fHCS4uUppOsDNL6S8lAb2Y3m0flG+tbOzBmh8zG6oi77ecYz6hvN4MRxpV+oA8b9eOFuxklcu9X8e6Bwp0voRSi55CeXqaZ6iioP9LLaTJSraaDSmYjc0l8zVNUyoZmkhiiOvGG0UuT2MGE4060Wmdr7/fjImHeWf8xRca+oBBDhjriVxYUMiHXm86aUIuqPcMQ== 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=BjEhU2bj+H3b3sXg1S8NrTkOa3ZZT6Z0y3qcXNB0Jqs=; b=UN1cWXyVotOAyVB12Rqy7OT2UWSHea/qkSL5HOq/QIbcX3y1JhfNLnu4ON6N6KdaYNuypsn3F3PKa6G6ELqUGVjHlCmjNwLHEBwvanztRSJIabt/zJDSvvqG3rGXnO7qLFoqwMxEUwhKtSsKchd4h15UteKEmsTwbLp051ui/4K6l5YY6IRSpzBuC/nKCm1KZ1TC1PNRpvlRIm3knhZNDawnKD1Vp5TGzs+QUd3AMhJlq1TqurRCWll6xmpyaggOK7SfIcAPSepmVz/7cIChfP4LCwkx5s2NXUCCrkXB70Uz1Vuvpv9ul8N6pSiz73UuSvaCLoxYgw/oPswxTYbpfg== 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=BjEhU2bj+H3b3sXg1S8NrTkOa3ZZT6Z0y3qcXNB0Jqs=; b=MAg+/tjDm7m1hVEVyGN8nqdu9OVVpGQeqWcphEl4t+ePdnK4kpAE0J+AtzpRrt1oeIykGvZtl7DxPdVqc0IJcFgbFoczhBRp6bfZ44rnGT8p9Pljbv4IaQhssbfH2oWM8zoOctVDIj1hPMs+pln2rK1IDgZiCFfgkukg808NFRWZBNj9XpUtbQgu4M3efI5mAHZYYPVDKLfveR4corgTNZzes+P9h3Z7xth1rWX+eAUjaCLLXgOnrxnym2Ph+URbI32WLQpK5+MnIctxH8VqOkd92V36REckdzRdxQj9/pkGNeMUVy3JQEufkB36xggO9POzMg4fqSlzDNUNcI9gVQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4950.eurprd03.prod.outlook.com (2603:10a6:20b:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.15; Tue, 21 Sep 2021 06:21:21 +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.4523.016; Tue, 21 Sep 2021 06:21:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:20:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [HoyYhKsF+z6rWrD0+HLlbsKbhPNIQyOa] X-ClientProxiedBy: AM8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062110.3515104-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:21:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 010bcd47-418e-41a7-a462-08d97cc806d9 X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUgg+QLCWedic5W5Ieg+eObAijA4HFIr6mitqnexJ0u7k0hrNMhk6jzl2atdT6IT7+7Pa4FERL/7KVkp60pRV8si7JH13X3XiRBUIY3GdygOX284QPuylEDQg5VtWp7EIcD4uAiCSCxOBDmdLdyDIzdAgr2hPyGD8XuAROZGlyGaMEEEAwUV8AgEPUwkdfo1G/gKzLeq/jGE8ayJVMqT8a7x4EqYZIAQFK9DUqOXCFnycuU0nRbo7A14gLTsNDIA0CtzqoTRA6/ukTexa6iZZ5PWJFRSwaAtv/lu204gFWcoojDUFM9Y+y48zn18I0UG9NQn81iVe3xqK+mtUcVPXjKBtzEEu13D00ULvR7uoLr41z9jNDXg8GJJNI0VRg2ax4moWKTCMR6SkLznAIJf/hGNfkMS4385VgKueuITYKiUQfT4PxEAjTB5Aw0tQ+h5v6q/my4l3FoLVE1fEi7RYb+1lc9s93tFAVCGe8Z/PtgNPu91mFhJioaU2SFjqKva1FKJFb1dPsavsAbD+AsXG4Kz1nS+DHYT9Pfi0yMNvPb0lLa4TggwRr7hvNSk4H84tb270PH5aE2xhubEbVAK2WxGKhI7p3cCD2wT4SpFKQA/Fa4nDESl+CXsZCL7wH96fHfdtG+s2EUmwexjxWg12bt5OS8WCvspT1jAe6r0kY7SnolyBFoIJ9TqZFFppgGth8VY7imeNxr4mcQ== X-MS-TrafficTypeDiagnostic: AM6PR03MB4950: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AlF/2qWQU6QVl+6B/NmgdZIQR3vbffgZyj3ffCxrZNM2yH83n8ochKNi9MV3kT7EAJ0GPhHOkQXq3K7lmCNmtoOsTmSV9/Z/hPZYz2kL7ESKiWDLZICc6W82AdMwMOkfdD3/zzl9/4dvx4pgYHqIOXQqmR3BfNAEZo7ic3grdoGCVIOAhFsLH7cjRc1YfS1jlks5ro7LDqlhEZ0gPy3lU250X4W80VKP82RBm2d2eNc6v/TS0C3ICv7pdaWDSY7Aa4/YlwCDhzeG9L6UMNVf1GQW21fVsWzYbqYGaXOzocEHxc6pNFrsJv91i8NX2+1wgOqcwJ+/QSSBcnqXQkWnZLvZKXUFM38sdHysClG1NRiyUYway1zk+tq/eD3Ko1ZJyJoFfZQCspnYpH/srhTNkKMHdBf1pcPyIRj11YYyJ1OFzBe9KH0n/99r/DqpycfI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5cELMgDIRKtQv6lvGyYi1Sc3H85yqWeEUapVvuYL5j2WpwV3AzPFmgF1VFu8TOa2hkXL5sOk2Dh3yZlAEEY5JshxeYzLLmgmhprMmuA3+giWAaParwJJkdczWEyAB5twTYzA2TwYv5BETa0dMisHgQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 010bcd47-418e-41a7-a462-08d97cc806d9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:21:20.2693 (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: AM6PR03MB4950 Subject: [FFmpeg-devel] [PATCH 01/26] avfilter/af_afade: Remove redundant checks and assignments 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: MMF+J1GSbFCj The acrossfade filter uses the ff_set_common_* functions in its query_formats(), so that the formats, the sample rates as well as the channel layouts and counts of all links coincide. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afade.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index a55d5d72c3..3bd0331e77 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -588,18 +588,7 @@ static int acrossfade_config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AudioFadeContext *s = ctx->priv; - if (ctx->inputs[0]->sample_rate != ctx->inputs[1]->sample_rate) { - av_log(ctx, AV_LOG_ERROR, - "Inputs must have the same sample rate " - "%d for in0 vs %d for in1\n", - ctx->inputs[0]->sample_rate, ctx->inputs[1]->sample_rate); - return AVERROR(EINVAL); - } - - outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; - outlink->channel_layout = ctx->inputs[0]->channel_layout; - outlink->channels = ctx->inputs[0]->channels; switch (outlink->format) { case AV_SAMPLE_FMT_DBL: s->crossfade_samples = crossfade_samples_dbl; break; From patchwork Tue Sep 21 06:27:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2136922iob; Mon, 20 Sep 2021 23:28:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIkB7f21Q9FKvnssOvp1TK2sCt/LTRjEPs+deiAHQjtmD8mvBmV8T6Symg9aTRaJBZVR8G X-Received: by 2002:a17:907:11c2:: with SMTP id va2mr12357073ejb.160.1632205690616; Mon, 20 Sep 2021 23:28:10 -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 cn17si9774808edb.188.2021.09.20.23.28.10; Mon, 20 Sep 2021 23:28:10 -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=fS6D8Yv1; 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 5E19068AF78; Tue, 21 Sep 2021 09:28:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075074.outbound.protection.outlook.com [40.92.75.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C56E368A9C9 for ; Tue, 21 Sep 2021 09:28:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bScSQP8m1fa7AdU/HkBwSWFOjzTFcbYbmxdyiaGx1Y0wy6YAC4L8bcYxcjitUcGa49c88U5FTOdUuXaWnJop8kFkC1OiwhhuhnZFkbViuX5lP90pI6AfDamc4UMh0/FD3ifCNi6yps0tMdhvzfJcJs1CXjvI0IouGYyJBTmfLZiC9dt0VQa6wSIp4UyFYfVSzKonHJH/Q7/G2uhaidMeiLfRtoyz94zulnwYNz1EkqWIZzf4zVFdLo+1nUc0+obK24faP9RBLhVILK0An0yx42ql+HVpWAYOIEob/sBD36u2PlSB2PGefhI9qHCKHbboDxEsTo6un1M4dph9yQnbFQ== 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=Tdp7Fx0Fe+HUbt5Y5T8Jw9U5DFwMLEULyXFFIffcrr0=; b=nnKDncANK8iRPM5Po7lc1k9A9c4+BQdqMCNrnkYX2/nEt8v977Jmy2GkemHo7OLlRt06eghHMjd3ckgm92sfakIe9Sjl96EBLYt7Ai/rooQ2BN8q9g9Wa632ypy0aqzPO0vOTgZatXPgHkDigAsPL4SVanlmoxDvc/EHN7kgD3ltr/td3nacwaOmpCL8iyijItpDWdxfecWOaSMvTTaD76STfye9efAZdlLGdrsKO5yRuZXdI9mPEp+/YGKAnbb2uxKc3QDHwYQYH4L3A5I4Kx0gRwIHoC+Qs2zZVz5k8FikcYaDRb7GTS3tA47XGkWGE0ZhHxIJhWYk81D2JfiWuw== 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=Tdp7Fx0Fe+HUbt5Y5T8Jw9U5DFwMLEULyXFFIffcrr0=; b=fS6D8Yv1FzW5VB5ciq2SY9siLsXOX/QnJO/4nPVb+isfOnBN4lD5fbivfi+p22/agVPwQ7htl5plEZScFDxVyNuLEAXZELXY7xMbmEX/UV0R4VKKfsX8Bbobur1REws/cM3r7hM7+HJVPazjZlZXpmIYVo6NwQHGJAGFTBf81uwjODmIISYHH7IrgcnpHAFV08UBo8FDPLOYM9BVqK+430X31v1Qpr8RtVn/y8STsIkYasNY3vi1cJspGZw8CVxDQVzKf8D0KPU/fm4pYc39D2sLkhvq17/B3MLdsQbkty+fzp9rRvzX+d1QibtgtDNoe6RZG1U/g57Y9/nIOQ+3dA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:27:59 +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.4523.016; Tue, 21 Sep 2021 06:27:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yMrqn7sQ6Py3nnPX7nHk1tJeNps+3CvT] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:27:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eed635f0-7b44-40c8-e829-08d97cc8f4e3 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3VTIMmVNh1pkyvCCSshice6I6VF7VnPxFik6H9LyY6gyjitvGwLvmNoSNlhTus692gM06D8miJb1b2wcD2a8vbuQcUWV3KEgh5DOaop3li3no1iARuMseKWnfRw0w0+QBvzgzyheM4RShk29A54eWHvzEWIHESWXnY4zJ00r3iuq24ZkyGaUclA8FHyhOlfzmzSDS6gxi5hBLIvE9nCaZp8eDOIpZwK7aTOQiK7XaHl41tOUuVIB9DiRqzfZY1Or8ykQEEwTBthm6wrmOXA323UJa9OJxbnxVnoAU1bSGcKdjiRdZrGQ3N9/tpJOBDsGVj/YTE2UOpcZf4KrPO/fSzWaV/MA0iMULpus6E2+FRGW7XFnjrv0uw5ttYxZoqfK5E5VzIjMACjNWxr1TmioXgEofRLpinG2kM5QaIXVhzZfC7SuH6LDiSV/QMduUm5FkHgm9MGXw45bdenSkLnZ2gGMuBvzbOJepKjv7Mt16tOg5mHrKxUv8RW0B567mjfF2ikgxqrzoo11jgHJmkc2z14w3lAFbe6B6i0ZB76ksuQMipkFZpMPMF2n+Hr+lkfzh+/qyIBWB8A3tXNdGlPTVcDn/nhDCjAQBIgzT6W8BhJrl3Qe3R4XIkF4Q63FUlMD5L9lCUg1hG5NJtknkVUWJlF/Sc1h6n71IEfrum6RyizY0gtW9VICXefA6V06sA6bx+p3lFXTVHjrwZp6zMqvtnaUKQeBvCW8ig= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZdKYucYkxlXzxX5PV781ecyfwhjGCLs9/wVZXknqifhE0wWvvow1vBeNiZg0HMjZwJWnF5NqejbvIr9gRq2XB6Tmx/9Y821O11/p7c0tVbiG8et0R9Qs8cfAqPsgUx4E8lsEhAcXL9ELWBmoph8Max4vIGIHdseAcJ7c1CZ/5FxYvmGZVjg/vQrtVjo6IuouVLhz7b/O8D2/RHA5Y4eDSeQ0jjwFmltp9VDF33bBkOaU5Pn0OsOfW//H3EaPTF7YFdWWlKKyyVgbFotz7meOMY0Q+vsKcVIGTQJGoD6FLHuEgxVgoaUSGOxcE2bf/D2k0oEBt3Y8EMmtQEVzsEnaXFqq2vDKZFtuSRfOmmW0vLH//NAIfhed9AngI2qQSvx93bTpwkRftupjA4iP0mLU4Xboxy/tmNuu5BBIblKZ2Aud7TS15fzJOTU9mS/dZgjY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Iyn4vFkaJ7eQO6/CEyv6bkp73jdjoZgBc5nQ3Rb/TjNVngawpXCpetG/l1kzaKGTZ/1n9PCifDzKyNo38pRIhvvQLDCYSOwLxe03t6h1DAXHT+hmRmoMCSd4rt5V3/nTgK0lJ/iOdNE26F61hLahAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eed635f0-7b44-40c8-e829-08d97cc8f4e3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:27:59.5626 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 02/26] avfilter/af_agate: Honour query_formats API, fix segfault 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: 4KKzsAK/DWp6 The sidechaingate filter wants its main input and its (only) output to have the same channel layout and number of channels; yet it does not link them in its query_formats callback. Instead it sets the outlink to only accept the first offered choice for the main input's channel layout and then sets both inputs to independently accept any channel counts. The config_output callback then overwrote the outlink's channel layout and channels properties with the main input's, even though they may differ in case the first offered choice for the main input's channel layout turns out not to be the final one. Consider e.g. the following filtergraph: [in]aformat=channel_layouts=mono,aformat=channel_layouts=stereo|mono[out];\ [out][in2]sidechaingate,stereotools The two aformats ensure that the first offered channel layout (stereo) will not be chosen for the input; yet it is the only offered channel layout for the output of sidechaingate and will therefore be chosen by the query_formats framework. Because the sidechaingate outputs interleaved doubles which stereotools expects the output of sidechaingate appears to be suitable as input for stereotools without further conversions. Yet stereotools actually only receives a mono frame and therefore overreads its input buffer which leads to segfaults; it can also lead to heap corruption because there can be writes beyond the end of the buffer, too. Fix this by linking the channel layouts of the main input and the output in query_formats and remove the code overwriting it in config_output. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_agate.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 284880833a..8e5cca4228 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -332,29 +332,19 @@ static int activate(AVFilterContext *ctx) static int scquery_formats(AVFilterContext *ctx) { - AVFilterChannelLayouts *layouts = NULL; static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE }; - int ret, i; - - if (!ctx->inputs[0]->incfg.channel_layouts || - !ctx->inputs[0]->incfg.channel_layouts->nb_channel_layouts) { - av_log(ctx, AV_LOG_WARNING, - "No channel layout for input 1\n"); - return AVERROR(EAGAIN); - } - - if ((ret = ff_add_channel_layout(&layouts, ctx->inputs[0]->incfg.channel_layouts->channel_layouts[0])) < 0 || - (ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->incfg.channel_layouts)) < 0) + int ret = ff_channel_layouts_ref(ff_all_channel_counts(), + &ctx->inputs[1]->outcfg.channel_layouts); + if (ret < 0) return ret; - for (i = 0; i < 2; i++) { - layouts = ff_all_channel_counts(); - if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[i]->outcfg.channel_layouts)) < 0) - return ret; - } + /* This will link the channel properties of the main input and the output; + * it won't touch the second input as its channel_layouts is already set. */ + if ((ret = ff_set_common_all_channel_counts(ctx)) < 0) + return ret; if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0) return ret; @@ -377,8 +367,6 @@ static int scconfig_output(AVFilterLink *outlink) outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; - outlink->channel_layout = ctx->inputs[0]->channel_layout; - outlink->channels = ctx->inputs[0]->channels; s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->channels, 1024); s->fifo[1] = av_audio_fifo_alloc(ctx->inputs[1]->format, ctx->inputs[1]->channels, 1024); From patchwork Tue Sep 21 06:27:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2136984iob; Mon, 20 Sep 2021 23:28:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAGhoHSDzJy54O+0Lb0BEkFrKPjeJArwCEKfWFzyCN0J8ZAJrGNDhx6tvi+cMz8s34T6D8 X-Received: by 2002:a50:d944:: with SMTP id u4mr21302503edj.327.1632205699973; Mon, 20 Sep 2021 23:28:19 -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 d19si19065145edn.202.2021.09.20.23.28.19; Mon, 20 Sep 2021 23:28:19 -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=K6fdysxu; 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 6F8EC68AF98; Tue, 21 Sep 2021 09:28:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075074.outbound.protection.outlook.com [40.92.75.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD0A968ACAC for ; Tue, 21 Sep 2021 09:28:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kzNK5Nl+Tcr58+pYHsPdsjkC4V0slgUrt8OnEqDYu5bjLE17Z3ZQNKM5IjvIT4k79XTTUcFW/GUnPM8sc6gHr9QpHgVd3AW8VATKEBeBRwKgsrAIzbM9N71z+vqS55Dls1hPbLVtX2m91Mci3NjY9MyL9nnIiuywp9/EbRZdHWg0nBdimRiBDZ/B+qhj2D/hckgD9O0cykZrV1DGC2q6i/6Yu20coI/22POKqltDcwYpt00zgZ1bGWVr7438c4yavuWLtOHHv/Ha0MYEtsFGBoR4BnzAdvZpt1QJMRDaW3nupjNOYLnJCKQo349226T+DJ8+w3HAdbt9Gf5trpzHQg== 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=ay/c/DkuXZAHcg9dcFuD6QRkyKnweCRDztzylcNRnuQ=; b=ZnL4V4jF6qQA5vtwH+DsienawXDYMRy4QVosP9AZv2Cs2KW0OWK78JHn8N6IeJV7xocMEGVWqRoDLBOgoiDQLAAD1NLligvXkIoD4mikoRbfrDrNsribK5Eep+LTVsV7Jd1omJJUq9nT8dLBNIsfm3RT/v8JlwWGC8Zz8fqgHFwgUQH+gmZjRtVsJWPY/I21+kswSD8TEDLOlfwFS2abU/Kew3E67SaSAUbF8TbwhdFf8Akb9MOsYFYFbKVNatqiJ+DtlTA2ONTujF1dZn4kgiu2BUuA8kZDj7NOsDIaU0G53bh59p2mF9gaIiAOQLhIAFtghXjAk74oSGaZojaTFw== 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=ay/c/DkuXZAHcg9dcFuD6QRkyKnweCRDztzylcNRnuQ=; b=K6fdysxu9EmGPfSbr9pJUVyQNUF+D/jg8rzTRFb3nwwt2Fs05dmszxXd8wQzUE4Ylo9EA05tAt033MB+BC0ZEJS4cD/nvPhWz9bU8KLjViWWYTxHWQkieGA777iQnL+1DXhB2XKoxa3+kuRYrKIQ1y2uIb55DmKCZDQ1nyK8UEJEnGS8V3PAeKvA36OYPRsmhoUBWblqwrrsPNjcxVCNgrpUZ2kYSWUtbIiWiIAOf8FYM8xNMd6En8uUwq0Zp6617gR3xdgGTmTAVmUeTdE5p5+GUufYUZrK/+yzPA3c2XTrCP+tUS1zle+s3S4Om6eraRtiMcxwkzQGm1TpeSJDag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:04 +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.4523.016; Tue, 21 Sep 2021 06:28:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QgX5M0d0upA1lgN6W6SQIavMrqnWOf+G] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88dd02c9-972c-43ba-1c23-08d97cc8f7a7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLlNbUSX1v3lGgyVp3PMdjyVM76F2XkHqKIOfO6NNs0vjbym3gAziY5Yuqo9b8mJVto7DlSmk/6lfV1NephyXCl6f60UF80UYqG1Jh27aCGIrZ4z5yO2CjWqhJMAptvEnfhybY8hUlZZeTB+C4zeHHkA+9t6rbHb0CgdH3EJfHzsXwalVt/hLZsIXgtT83uTOcZM5wmxvscceG0NeEgxOTRHpxG5W/e9YmDFo660bWvc5PP/l6hNRWeDFrezfkcWPbpYtq+9DUqQbcBgjmg7mDbMEc6V0DQnv+Z5BLg6PmrTnvEElUgGfhcb31D/+J/D8o6jVe62AXCzN1JhkjSZtgd6ESGPznpDqlVL0qa/m51QMkM5SdFg9uNiDNeEWYQ4v+cacgdBNPcQduG07kM9DEYIPvs+fPYy9sUQOeXSHIkKicBSs331331d2PYVGinm8W4AHiyUaDNve6va88e5uvY/MtPDy4wMhBUIIUsx7ctj6VOtSFIlEid/yN4WxH54FDhHGKxQ/46gKspXDuCZrXCiLvN+CXUQLVS1q3NTZMZF68cc2NVhg8iGAJ9OotCDVY0hXNticdvIvXf4KVmWc78ALgwuzdxKfyVAzv6hnereXqlnNhG3IHzW07VJHeQfQwRY+nH2A5ZyR/mhORo3KC15SlEaztFHkeDQqRjEJhi1qrW/t0BaDPHB35OBJcyDpaFu87wgMenV8= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wjQy/i4Z/E1776tTiAblSKLgY74awY3GNQB45gJ8xyHpS0y7WC6pmHGo3FnX88qCGMyThMJUNXkTQ8rAy4DNgSvPdlE9afgXSgmyoBXKCo4XAx/MAuyC3B34G/9yKSQh72qdsMjGJOOwih27uB106ySxk9XMVo4qEQothlF0/IDO3AGevgpt2H63tTaVC1u9qrjDlS4ojXIEDpfWaBJ7zjjj8+Pf57DByw/7VVAHewZpi8Wwb8wTWqwNQDbrhDLtT6xtJD1ujVdagbQSFY8ZLdGxG6TnHeK6lbTCic+tctRL4fz67ExvEQ0LF9Plrz+t9qJ7A8pKvQMp1P/ABwMf8Cwm8T1OecZ0b+njLAj9Q49VutIByU0aO+InzPpHK577zKQYkvpfM3x72jhdF+DvI5DNQU7mtVWexkIcYXw1Dnf8r4H9Y9K2hS8kIA0CyM4k X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9LjItkg5sas18H8fR66THgydzycXOcyqjPu7rPmKrhj2EqooEFlihXwjxrLsHYL4O47N8xliRHNcHDTnWHQTUH1JSleYbR4wBUgk0LUz5rP8jNwgmdjYciGiLEexxJ4Ht4t8fuTkgjMgM/xUc/nohQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88dd02c9-972c-43ba-1c23-08d97cc8f7a7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:04.1755 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 03/26] avfilter/af_sidechaincompress: Honour query_formats API, fix segfault 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: Y7SJVstAC6TR Just like the sidechaingate filter, the sidechaincompress filter overwrote the channel layout and channel count of its output in its config_output callback to match the channel layout of its main input instead of linking the main input and its output together in its query_formats callback. This is an API violation that can lead to segfaults, as in the following filtergraph, where stereotools rightly expects stereo, yet receives only mono: [in]aformat=channel_layouts=mono,aformat=channel_layouts=stereo|mono[out];\ [out][in2]sidechaincompress,stereotools Fix this by linking the channel layouts of the main input and the output in query_formats and remove the code overwriting it in config_output. Signed-off-by: Andreas Rheinhardt --- Will deduplicate af_agate.c and af_sidechaincompress.c later. libavfilter/af_sidechaincompress.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 48d450fd50..af4a90ea09 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -298,29 +298,19 @@ static int activate(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - AVFilterChannelLayouts *layouts = NULL; static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE }; - int ret, i; - - if (!ctx->inputs[0]->incfg.channel_layouts || - !ctx->inputs[0]->incfg.channel_layouts->nb_channel_layouts) { - av_log(ctx, AV_LOG_WARNING, - "No channel layout for input 1\n"); - return AVERROR(EAGAIN); - } - - if ((ret = ff_add_channel_layout(&layouts, ctx->inputs[0]->incfg.channel_layouts->channel_layouts[0])) < 0 || - (ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->incfg.channel_layouts)) < 0) + int ret = ff_channel_layouts_ref(ff_all_channel_counts(), + &ctx->inputs[1]->outcfg.channel_layouts); + if (ret < 0) return ret; - for (i = 0; i < 2; i++) { - layouts = ff_all_channel_counts(); - if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[i]->outcfg.channel_layouts)) < 0) - return ret; - } + /* This will link the channel properties of the main input and the output; + * it won't touch the second input as its channel_layouts is already set. */ + if ((ret = ff_set_common_all_channel_counts(ctx)) < 0) + return ret; if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0) return ret; @@ -343,8 +333,6 @@ static int config_output(AVFilterLink *outlink) outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; - outlink->channel_layout = ctx->inputs[0]->channel_layout; - outlink->channels = ctx->inputs[0]->channels; s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->channels, 1024); s->fifo[1] = av_audio_fifo_alloc(ctx->inputs[1]->format, ctx->inputs[1]->channels, 1024); From patchwork Tue Sep 21 06:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137102iob; Mon, 20 Sep 2021 23:28:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaRzKy7ZNZBwdv3euU/PnHMGlef9hrN9wIrprDaNq6kIQdz4bfZp9nxjMAE7dcq0xHZze7 X-Received: by 2002:a17:907:9854:: with SMTP id jj20mr34330218ejc.133.1632205710921; Mon, 20 Sep 2021 23:28:30 -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 w9si18505886edt.507.2021.09.20.23.28.30; Mon, 20 Sep 2021 23:28:30 -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=g2pksCm7; 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 81C7F68AFB7; Tue, 21 Sep 2021 09:28:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075074.outbound.protection.outlook.com [40.92.75.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02A1368ADC6 for ; Tue, 21 Sep 2021 09:28:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GOolgmwTC69L4ZXbhqT5/yefEO3t0xt4+kfHhdfxNt62zuerMFJwxrVBRsprxj5TzV0Hc4Artyz803qgc9wVHYhh+gLm+ZbURbe+UzaBhFfLDm7yTCZ04gZpEhB6gMARIlOJPprLD2Gi+vfJUiVUV4CZOCO1LvFLHGa6J0YAZyIpjPzyGsbt6sbcgFaf6lPY3XT/uIGLvBKcBvsG+f/fpN26kEpShlVRmXB+AYNl+rzwiFSKISSfCDjUnJhlzpPeCxWCY2JD4392zfLDEKNogE5+wFunpZFpg1kJmayihsIcY7Sa9lK5A9RkUy26NiDNxsn60wqlAy/qPDBaoKP9aA== 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=FgqEesQ+EmoQhLG5YUL/FtVUuLYEFGCskYlRGJDUTfw=; b=UKjqZ0n9n414PCDa2csuJKIkoTXkQZ9V5OxIKTZR+fZHps30LVoXE8I0ImU2+uxKLwxHJr5z1/ACLHRN4wQWQ54syPLODr5YC4nTECbtDnhfjE0Owj9xZxP94t9VzIXxRBEMM+/oJdAEfpJxidaatvFZW4CznoaPjKmXJ42LFl8bww9iSgf1qjRUTzzWy0sJOWdgLVRX/pjlqyk+uowzln2li8lxsKKiP/D33B9zYRDO2/ID5LQDs/UicL0FJNCu4JQmPvAoVbD+A6I6e0Co5IR/xOcBPTmOUH+HSolLmgap8uA/Bab1pay4Yjl4K38ccUG22Acy+4bMnfgd5q/fuQ== 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=FgqEesQ+EmoQhLG5YUL/FtVUuLYEFGCskYlRGJDUTfw=; b=g2pksCm7NIRPsd9mSre4Aj7/uUVtS4z5Ekq/tlh8up7XisT+k6dYBUgxZwSv7JUXTtzoxsNh66/4TKBwpYYfYKa2IdsoquY5O1iI/PYAKn/CQVBdsvsU01kScjymWn9xRwbTgc0FK2TjUiv7gQy9BbiTO3zyyP3FuyRe5kASm/cHC3QFM4VyQyHpsybz0ivaFPF6K8EnnQ0ps9IwVjoy/DME/JJOZ6W9p0VqdghujoiTmawO2nkQbvHNwjq5fLdaGEsQYlCyDIc1Mr9sDVLaOvQqmaj64dYXg+7wGHL7Ggc6WOOldEPesK6j7WaitUfQHFG0WScWcijUIfreTml9uw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:09 +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.4523.016; Tue, 21 Sep 2021 06:28:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QQ7HNPvNmEjmwNkXeVCeArv0C2gvTTXA] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6ae2c66-219f-4cdb-d0ab-08d97cc8faec X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqS4MapTpdkRlFvkoe4Rb82VoQwTr+xjNaqq7vI6OWicniI4CfkmUjjTQZZcCAQDQoyUcSnPwROHJfM9XCUESmSa8bfEKl9mcyTsFGtPPPU69yazIgZvQJU7DcTLLQ2m3gV2vH+FrmhFP5Bur70lH4+mTwKtti+CIm64ja/J07nPVCKrjGXNQT9EJYQJaWHm/06mFzubELZ1UQ1fWZqCaw9IFjN4h6AMCdfYco49YmajlCICweKDdkjyBT9uf0KSDtQ7/Ye7QzHcJECZi0Iv5+6I1JtYFSCQ2Sr7QTq2ZFpDxeUKXkPuP3kxYnn8R4D09+fzFm/xICOavqR3uz1+o25Qzcv1c/miUSRwJeyI73l+TdX2ro88SIj4c5B50zUK1e3F0TCUlZyLuC7MX5WDMrr0We+p/6UQwJlIT0eYePCRfRHJEkhlpzVVsDo4g7xTRL7pox7/hzaDb2N/3yd7El00FugyIU4gAVgpaPwNZupOEogpx6d5VnghUBtpb561gR3Hz+tdfwYl2FqKQf8098svlGLpaV6361Cmbgc3Yd9aG/5XaelaQYG6AJgmWv/HX+flGHr77OvTmkTaaLn3dHqacx1pRMC79P+Z+mrYSwc5mpM+Ej6lBIA72qXFMMmwy/uK6I1l0zOxDQMw5vDx3l4LVXbPin10fxumROGbNYAzqOmauAvjkCw7E1YX1Baa7xuPl1nQxxmtrSOFNaKhWRpw44mugnW/c3/QmDlwQF0jGY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6OuwRcAAWXYTTMikITLphpf5UqrpHxCFt9S17zy7M/pp0v0ly7bUQaJ3OInphc94Xyr2VS463wn1iBGtcGIxG0meAI8IZzo/y55LuUq4zZVPBPJ38f5kBHIpEzazS68e7soccywX3PmP9cjhpZIPwRg1w1nrlv2nlwJtXQ1PPGignz5t1vsUTvuhSIrLTLoKnAFtHpLqucCcvsU6m1Z9WdJw7sccvBkOrDR2zN0IYFEj9BvTU0bXE7u0lohswbDdKsQxLdRTH1v+Kj5Ofjz6OtmCkTIuSNl1xfPhAngBjDKJNWJ99vdYhHaao1ND6KWuCpcVvR+0r5EvxZl0BUq9EG/q7btl7L0l6ZajlHLOl732rwUv2cOfxioGp52E9F2vLztV84qoWHpnZtZtu8EnX2u9lzU6n5D2fvP/BUiK+uFCPnQkeXlba1eQ5cCY/DLA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UNaMssJAHWr0zlnNJO1pWCwcExaE2wKQpIeATh0F6A+pBwMelcG16469ftkvxw9V6Qemumw5Sco37p6FXT+od0ghea7VIt9LopwWX6jCQ2e/zLtkUm+Fp/07EqaT0zov6hxNAltZfUhDjox6DyzzFQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6ae2c66-219f-4cdb-d0ab-08d97cc8faec X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:09.7033 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 04/26] avfilter/af_agate: Remove always-false samplerate 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iLoaCCo+dWag This filter uses ff_set_common_all_samplerates(). Also don't overwrite outlink->sample_rate in config_output; it is harmless, because it is overwritten with the value it already had, but it is an API violation. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_agate.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 8e5cca4228..5de2cc0f0e 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -357,15 +357,6 @@ static int scconfig_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AudioGateContext *s = ctx->priv; - if (ctx->inputs[0]->sample_rate != ctx->inputs[1]->sample_rate) { - av_log(ctx, AV_LOG_ERROR, - "Inputs must have the same sample rate " - "%d for in0 vs %d for in1\n", - ctx->inputs[0]->sample_rate, ctx->inputs[1]->sample_rate); - return AVERROR(EINVAL); - } - - outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->channels, 1024); From patchwork Tue Sep 21 06:27:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30401 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137180iob; Mon, 20 Sep 2021 23:28:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXNnmINGsvIXJsLQs1exPlvmLPNziYmE3C6tvV4LcBOBbPOwhMEV5/Vm0xRjYWs0qW4RBW X-Received: by 2002:aa7:de14:: with SMTP id h20mr33636332edv.24.1632205721253; Mon, 20 Sep 2021 23:28:41 -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 di3si11468329ejc.490.2021.09.20.23.28.40; Mon, 20 Sep 2021 23:28:41 -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=pGlwRY+s; 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 7EAE268AFEF; Tue, 21 Sep 2021 09:28:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075079.outbound.protection.outlook.com [40.92.75.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3ACB68AF85 for ; Tue, 21 Sep 2021 09:28:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hdUqF0j7CJ0NEg/u2nnNOaw77I2eDPYaR/9lH7ZKUFCnBDVtsrpPe0b4i/LXwJ4ScIieWobJcgh8vvB10tiM6qC6ZKAaPfvkxLYhl+AeQ/ZxPJU+4xEJXEoBmkQgoBFvvEEl1GYzwglFrvtqiR73m4xkotlpmO7Ixvaa89wMe5Kf/boOPObmlQRFliefcQHyW++4GlvKKdnsUJ5yJItURSlOOrJswoxR90OwxF92YC3WzjdLFYjg9+po0O2J9EU3ULvusbNr5eRw9Lqsh/wmX2XVB3S6AMjBKHTejEP4YszewYUmArVyge6yGPbcjfwIooc7hlxk9yAUjKVNohqGsw== 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=YDvnMNQd8erPbhlyn5fVsI/ilZw8wZrVTYHHP9v87jo=; b=HAqadgnzphuP0u2/Uy7jEPz4+r94atRIENwFio3WxhIZtOCvCzNvjZEW9eCQx8UUrGA9xIqEngPcmyhNSguUNlglhHnKZQu5xHdLOn5eTB3juOotlfCnY54qO+jeSnxUNQvFMMc6LfGVnn4b7bwag+UCuB3JeW0lToZj8BoIQaEy906kDSJlJ3VAOfsJBPGPFHDrH5CgkdNNNkTU10+tYbzMyFJupX5Nq9AbSG5zjHSOtRVszzjdLV8PsOBfC1U2+3ewYyHPaDpbDbBTgi5ba/4JHSP5sESKiEVTuYGpnvol48jTvXT5zLB2Z2hAim/BQkKk9qqeQzD+VBJK0yOa5Q== 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=YDvnMNQd8erPbhlyn5fVsI/ilZw8wZrVTYHHP9v87jo=; b=pGlwRY+sRU3ST3D2g6RF5Fji5dZngRb0vqzs/tsaUs/TVlk2Do3tNS1OGORzja1UJjjOA68JguFtjzkI4FBzITEe6uBqrP7J35n95THZ2Gj5MDw62v3rwHy34/o5mwIoEcYGXRuwNYI7qYPQEt9hkg/mPOXsGg4A9zNedrcXVR3WbzVhUqYYPeKbdZcKkTSgC97QsEKea7zykrNEgiJdkNDxCAnQT4f1wlNa1bDejgKfSPyOQ9b8K2Mii2CmKYb1at/PYzeRL03LLFjrLqOTbqNojLnUdi/Bs7ib91sWU9RGtKMyNZD95Zxsn54VeLe2geUpeY4OTOSbHbj/pYZnXw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:28: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.4523.016; Tue, 21 Sep 2021 06:28:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [vBgquYQSFSDYelyFMmWlT1Qz1su6EDZ7] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f58a06db-1166-421c-c0e7-08d97cc8ff3d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSy7CLvw+O4+XFQCoCHiXyqocXTCI6o47JcsXWDAgx5Dwv0lFRKBhYXk858MV3h5E3ZaS7gE0es2GLZk/SXCkLVMYX6e0BA6B0TtwgcXiW+0pYGncCstGxE/myJDq/I93pD0L6NsVZbGbuSZmWvCBQzvgRLnLWQL5Mg5YMVOkUMJyS7lgPr2anzuwAq1P6fxpw+oHJ9QAMCZ1MA+ASZly8DlEwqgyVG3PQeNQHJHLj/8X0GWaHRN9sqVV7Bg3jHmhNM6zuPiZ1Kt1X2cKiL5S+61IDRporaOyPiwfS7q1L8tlHIUs9RI85jwJGgNqddS88OI/Z7h+Rp0UvqtGh8ullxK+Bq13PISnLWH8+86J8q7ndE0Ve3WY/QHnozQwz+OdKEpov9CHmOdoeePyvMBB6jNqRJeAtaT5NgiJtD2HfISDtfSL53ZwyqWwYzS6FPgiZ0lb1Dc7g+g5JLQdQV+i+KdCiWHmYHZmXjOJcKgSbiPb1e2DbZBPLKjzE27Pcevt0R2Y+es4RGkHT/1jMF2gIywPunqNsdY9EsJ4fR1khG+2+coWi/JvaD85mjrl/i74zU6rk8PO41IBk6Ol4e5tp5bUkYoNb10I1w9W8ZdhTtQyMH2hIs9Nq1X1bo3KC4Y76UaIybskapthmbjfxV2vUgY0NUYj/p9/lpog1U+wzUL7jYRp06J5vTZioftbwkyF4dKGiQbcZnO4V+wqH6gqgvpK8OzSpZNCb2GsHtFH8RYs= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WKgZiIOX+ZnZm1eDRlK6t4Oi01Ew4f2dJzRjZAP0uV6CjfyM1TwYNdhQMg+aO4lJhAtt+1Cu1fvjgW1Y47zi2Q79LBn1+muvW0yMwF/66w61PPpjgSLGSNq/YRa5BEbOBB2bgUxfg3loJpVB1yj2ALZYKSvOweGX8RdclcIkrM6et65JNBtMOyufgldi+kcaIWxOSAkTNUMvo6txhV3YzDxrX3M0MbkiKvLX43sgWxV35vD7uERINvc6INAhLLLK6WRYw2XrhXFYqjK5kdInH/iBuPH0TcNd7pnTlHroIdCGuyuxegzxOYcH030kMiAQg4i54wLF99pCO9M1Rd/pHDqpn+7Ye4tqRVgkNvzO2y1lrjxOc9SHbWzooCG1Vt4k4TtNa4+/KypaMIkFv3TMAuYuz70ffzOZFSTrEL4xblJcVxbMdwdKA+msNkLMeMLl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hct9V00JqqftjwAriyQupXo7GfVLJrw41dvpFVLBHhSjTUHfkdlIarOF60WXMf+FRqFw1adz5amumwTVA9wwfbKc0C9YzUlv03LlW7yxgyAYHfTqWBDtzPR1gOQuuMlxX/4F1MQnGbq7EBaL/jjiAg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f58a06db-1166-421c-c0e7-08d97cc8ff3d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:16.9715 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 05/26] avfilter/af_amerge: Remove always-false samplerate 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bvXmiaydLyzs This filter uses ff_set_common_all_samplerates(). Also don't overwrite outlink->sample_rate in config_output; it is harmless, because it is overwritten with the value it already had, but it is an API violation. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amerge.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index d67e3d7e32..9c6da15a9f 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -151,17 +151,7 @@ static int config_output(AVFilterLink *outlink) AVBPrint bp; int i; - for (i = 1; i < s->nb_inputs; i++) { - if (ctx->inputs[i]->sample_rate != ctx->inputs[0]->sample_rate) { - av_log(ctx, AV_LOG_ERROR, - "Inputs must have the same sample rate " - "%d for in%d vs %d\n", - ctx->inputs[i]->sample_rate, i, ctx->inputs[0]->sample_rate); - return AVERROR(EINVAL); - } - } s->bps = av_get_bytes_per_sample(ctx->outputs[0]->format); - outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC); From patchwork Tue Sep 21 06:27:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137295iob; Mon, 20 Sep 2021 23:28:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpfWDcCo7FwDpjSbNdUZuNHzbFllE55VlVjBrbtbuBDKOe50QQSUVU+rVtFXA438AvwzsD X-Received: by 2002:a17:906:b094:: with SMTP id x20mr21392726ejy.273.1632205732790; Mon, 20 Sep 2021 23:28:52 -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 k24si7416095edk.120.2021.09.20.23.28.52; Mon, 20 Sep 2021 23:28:52 -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=R9rhaOa6; 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 9BC8C68AFFA; Tue, 21 Sep 2021 09:28:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075080.outbound.protection.outlook.com [40.92.75.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C83E68AFED for ; Tue, 21 Sep 2021 09:28:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P9PMosCpnhOqLNBaZkQAxt75iaEEMptBpM3WNHARzku2R6mY0X/Lq7yzpvtzlyBp8yMErwf+XiYOsNhBrLxWjbLAu6LFT92Yl1NEfSL7GXvEIa5Gc5qvlSR0pggDbQ1rg3+yf2rRY8frtWAUYGmmVAqnOH7Ldt4rTSsf2uykUSRBrZG2QyEQI3jn4AJVtT8QhYHjP5HsYYSEmpcu+F0Y8NLkHVBgq/hFYjFgICGKWcug+zmyqDSna+lSKXwpZB4Xd98ID34XN33P95dWOQNBoxuFh3bhcV/iaqeceV4DdonexQxinceFs1U1jRQfDB+s9dKmruXsOohrghVOmY4D2A== 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=H19TYzC6UAVuLz6J/aRc5gNQAGqzEKHZmVWwRMKupiw=; b=SWmDUcPAxLAd0AIJCHIUy74X49agGMxv/jRmJ8fi3KVsbnAo8KIrnEtw/uOflSbdKndAF7Z8wgjjY8JYYuPU9AuD+nNqy3G/BBJucBAVNVFV9MVb9hioE8CaeM10aqd6YzUCazD0eWdSfgR84ph3XWn6+z8qFEg8WA4jaKBZLVvStPUPjEhc3UFovC2biY/wiZDFdDXYhoFIZuzSErePohWcwEkG6Xt/HWOKJj9Ejzpq1qnAMj2PeUnN1RC7Q6S7jYuznkeeW4kgzUrvBQI0UX3rOex8bV2JhNVuBgp4ZNNg0YTIjEtWD8Iv0qunjXF7Y1QPmm6moR+UpAG/96oiyQ== 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=H19TYzC6UAVuLz6J/aRc5gNQAGqzEKHZmVWwRMKupiw=; b=R9rhaOa6BTdOWf/t01EltHIIpj+sj0Kc6GZ6Zw2s4VSkcwHnq0U6cK+JVuOQb9iW8EKFb2ngtPyNQDdo6exazRRY1K0/RBcDSjsWw8gZIpwPgv+yPLKjTl1iVCFZymsb/OFeMGFlw9SKFwx5oFVdmcGI7kAeAS2eVu9Uw+YWFepCStCNkoMv9rcncZymWoRv+41UemXR6Y1PsWhYuBFh2DpCnGbGcTM/5SNmyotzlYmX5ToIS4oyyI3BawsLQwm5jLVz+kaoB2wxV+gVOwKA2PgpthcVxxqOEUqGzt0WxY+hY3Y1OsnVGYB2GARWEowCAMgQQzy6VUGC+3S/QCJV6A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:23 +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.4523.016; Tue, 21 Sep 2021 06:28:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [z06ThIJzf0UiAX+xd7mpY/05XglreTbf] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c06b71e3-f69a-4c6c-d4f3-08d97cc902f7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSIwuVxCUjL1DegG+y1uwXweuFiT4DC3v/DkKoDFoX6XS8HBTwDEl9ck5worrmj5Go++i6hkvnaJtanLb73LxHujCMVfTUiTE958zObQ3v2NgnGEB65YqyUbx2OvcjE9l8tun1o6/cumSCAOMvbx7Ng6eG9oZvbpn/neCp4A+LNROj9On+izIJz4rEljysE//CbrzrpiZJUvBVX9ZXbrq5osITV3F6ZPWaJ2enB6PBp+Si7APaAxd+qJkVHnqJkyxP6msIfUUiDMtv4yUhh3LVd1p53bVbvGMocOk/grGlpRjTbduRs5XoMHY6IXBL5W4JZhXP+MnrBVASQHL938STl8qfqeyS/SM+dB6i8sWp3IqZLlL83cH9ddE7/9S3bu9Lt8+T6Oh8wnw4VyvXYfFD5Q1VDo22wlktbhfgN7O+rdoREz3mRiVMnbWVp/wm5wbnAnQE+dnNTNldCq7OCZrca72zegnwzBleSmq/rgv8v2uCta7hx1Ret83h430wjjy3E7hsK8hXPaX77sRvUqtoUSTof+sONNU0z7PP15AW4FWRYsA0HxabpWqMBgJevRoHM+F3LGS+Z7MHu5KxDh632OPdXAG2SURzHRaHYxSI0ikgijxXpG2GyrJL8O+hdETnds0KL9rVVV2zzABWBAsvVJmOTZ3HksAt/BuqFmBur/wbp5m017q4kJBdnMoftGw8spa/P+eVk1B3VyAs4XqVK7hPTFhIkRaUr8vSk68kBGs= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T/wYF2M1WhFTjdvvjUSryuN0isUcTeDPqkgyJ4kd9GvGwi73qwyPIVAU5/OHCUowYG4MJohxHoSQ1GqJPfJEmh1sRUibibbBytFiaGTuuWQ2j2dhLQEwpJdvUDT4co5ZT/Rtx8jnN3qYgKkuO9QdesKm/O6SEcquo7E5Pps6tEFldGzSyYMB6j8OsXJF1i5qDocqevPApht+2nF0zzG1XS0+oK80Kq9vbvjfrBhcJft1zjqtxxmre50g3u6AS4BQRL3C+tO4Hs4Y/b4Sn4jQOiFB0Xg9/SpY6xSqP2aamUH/amYTJ3PzxdMokPNtP4LrPLAhloazMP7BU3E14mARue0MB07/gqD8uP6KqwGJZNv/jNcRXPo+rFWUT71UhyJHFE5NEBrCwesdW3xeEFxnHovgQrah1aX9ydXszwJoeIYBiVn/8dOC805TtqZ1D7vv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4UxmaYnZr6XB53vgg5/BHQzsx9CZKe6AyJEGG1ilJ70KLAWGVSYD0ALc8+0dBe5cnbATGLrTJGF1HFMzq/hlKQCZK9ViOs4O8DZOV7fQ63yc9IhR3M0ihAV3rewzHqj1cEpp1Fa8bRqVAusugAUwQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c06b71e3-f69a-4c6c-d4f3-08d97cc902f7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:23.1803 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 06/26] avfilter/af_sidechaincompress: Remove always-false samplerate 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +CvHx8YYooUb This filter uses ff_set_common_all_samplerates(). Also don't overwrite outlink->sample_rate in config_output; it is harmless, because it is overwritten with the value it already had, but it is an API violation. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_sidechaincompress.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index af4a90ea09..22a86ae2a7 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -323,15 +323,6 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; SidechainCompressContext *s = ctx->priv; - if (ctx->inputs[0]->sample_rate != ctx->inputs[1]->sample_rate) { - av_log(ctx, AV_LOG_ERROR, - "Inputs must have the same sample rate " - "%d for in0 vs %d for in1\n", - ctx->inputs[0]->sample_rate, ctx->inputs[1]->sample_rate); - return AVERROR(EINVAL); - } - - outlink->sample_rate = ctx->inputs[0]->sample_rate; outlink->time_base = ctx->inputs[0]->time_base; s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->channels, 1024); From patchwork Tue Sep 21 06:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30402 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137373iob; Mon, 20 Sep 2021 23:29:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+2QseL5pC0L2tK1V5PNDLiJvrNn8w+fV3/of5Kzh1oZK4rS08HlbvJlTA7q2SCHoAqYEU X-Received: by 2002:a50:f145:: with SMTP id z5mr33888718edl.4.1632205744187; Mon, 20 Sep 2021 23:29:04 -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 s13si2917698edh.555.2021.09.20.23.29.03; Mon, 20 Sep 2021 23:29:04 -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=uHwkTuxH; 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 B24D568B01B; Tue, 21 Sep 2021 09:28:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075056.outbound.protection.outlook.com [40.92.75.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7640068AFED for ; Tue, 21 Sep 2021 09:28:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cg2QRIRKmDioXVHckUEKqiY6xt5kVUzG1VC1g/wKNP7/pU2dfLaTkuIXmKr3jlYrm0XMaBQ624tJ8fLhW5tcsdhh/InpDn9NyzyZQ6H5C8/TirkbqdG3e+J165L28X238PrcsqDJeFl5GTuPrxH1z3Y96yhcVRSaeyzO76ZGC2fx35A3Atdj80spMgUhVCKu/p5MyGEsI2ieMNnzR4bqsVnIw5eXHAOV/l9ECyByl4BHCkRFfK1wJlKgBOPH0EO1a6ZXEYcKHpB9lh3e5/8Sxa9ntZmZP+lsxCQA8N7RDfWYxS8PLjUmrUSQNJM5Ues2oJNwn7l6obVDsSW+CRevNQ== 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=oTJjuwXe5IVqSAmRIP501kB30qGtLNjLivnPxue0924=; b=f12pSPpkLGjQd73o8DXKSdbtQKreGDZSC9RRdJ8afIsQmcoG5gYg5eW5IsqpnnVvsRqdb5La/1q/dI6OLumyKGp930LD09RaFV0SboEGw99C1/WcdeflmPoigHjQLYVPVxkjis8IxYCZ8KtCm3eqh/XK9hA7KHUm56R8DQZNUF23xcW9gItqPegkQ+6zKD/yNoEnUYPhBuhGMeyUbIXAjGMfhSe6hxtC41FiJ4PcHX5+4wYb2OSmMTtIT5xmNjMfX0qgvwTOzzzgkLDvvLNVJvHRlinxE57rRMlqOTx/MAtAzb9bPXmi0jGDQP7XDg3xbN6xbfTxFiOFtdjNxMmOEQ== 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=oTJjuwXe5IVqSAmRIP501kB30qGtLNjLivnPxue0924=; b=uHwkTuxHpz6r5nMVA1+V8Zy8jnj43DbsRtoDoLkmsyafqmvuidCzDRGB+5au9tQ2Wgy5ez+DvucBXAcJr9jwWE/LvfJU8wgyZuScE6F5T6XK2eetV3oHJNxH/+kNNxoF+6XpRjY/ZTqocX/Xs8TIvDqmXqJBQ+vcrOVuwxV17J+JhQZJdltEBahnFgh6He9kEDrQ56lVFlf7NBQ29hZ/13+OP0ultQ/RUuHAxJ3xO3E377u8Nzje3IbwuyGGvnPUl7vomj1B9rWTp4aCOTmzt3quQe6Xkr3bKWkC3YTnEMayBFshX9RCplVYKptatX6hadKGUNOyVmEj0o7m11I6eA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:30 +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.4523.016; Tue, 21 Sep 2021 06:28:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2mVImDx+k77euu6zAVTtZPHhrqtxXhNM] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18b70119-5038-4fcc-5fc1-08d97cc90780 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqS4MapTpdkRlFvkoe4Rb82VnJZiktZFqaT6+X1Gg0/dFdes4KPUeaapqxe0PPYAokXXTRB02JMdhtyUmjY6KjFOVlGBVlkTRiXXk8kMzarbWUyfTk9FxvgP/ZqAJx4yKTxqMmbMbIfU6AqxhFBbXy2I2bk6ZMDBZOB32ZzghPVPpVkU+d/TC0DoA+JfmA8aZkiR9/JorDY1aG2IKexfnvwtJN2LjOczrEFs7oC6cR7MkVf5sBb+Rz5wpukJpioaHuN98YC8uaxBgjy74yiA7UiAAN+jA3DJ7kgfbtu8D6NHZtJgV9XTkFkxRDc485uXYOaGbO5880SsRpSx3WHW+jyWfr0ZXJmmwhJ4E3JEG4HyyEDElz7fpLBvzY3rXHAE1weldX3MWyG6CNwHMQlJ81JF4kNgMAc5gvyperzjrib7Qn++A1WADHuqSq7n7COMSRBETo/KjAxZHgHRo22nDINk9gm2rU1s4Mi5Z1v9uPmexBaLvgIMoUWVMUgzkAlrwm01aT/LA6s+H3xrgg5fo9Vn9Jm4u/FWVNa0HOwqm6WpXx4SQtvdPVqDmcIvk61vkNQRrf4iuPFk8z9vAor04cWebYbwTcRdxC5JktHtMVRcb9G5PypThq4KGjrPfO+jZATNx1OkXbwxqb8gtIL9pwdnzMfxDarK2ASGZvOLE3h7Fi4CMm1JuqWdw0lRWKucOhslnhoznvEB0ve+LViUdF29V6SZ/i0BUeWH7wk7Z7QOHQ= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cPnxsLEs0O2al4JrZXQIH4uLNlNFYZsGPjbpoSMD1D9DjGhIpQTSypoUt9kvV96rBKWQmWnGzxGIRstyRkuizeqlm5tY0+FrOyMP7JkbAWPUCRAR+b/x4OA6qYxDe9ggd0u+qtGx/qPMEtMvfB5XOysJW0iHxAQX+42BMAnBNh6j/9ZaoCdXM1zkeXNs+fnOKQAM6IuP8tCNZf3I/rUyOsr+dpHUOKD68fEJcUi/7iCyoz73Api40rICxu5EbfDZdiAIx3R0f0SOii1YA+0kDtkXcLucKDfhjogVwgUAqlwFylDGGrOI1rB/evMw7biIYWpYLaAK3LLzWMu2LZaiwmyo36UU5uuxF03+8uMs+4aBSBcECu9H0woRRsUur6dEOMobAfqHDEvJw1vt3YPZpMmjfY7cdkuzt7Hj2tfVq3vzhc21pU/w/G24Or0ZJaH4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7TfgjlERc1Nrch57mx9qy7siTiAL9l8Nc++RiECp6j84VLPaN6aoCU1ZmZIF3CtZHix/OCCT35Zd/LLJwjbCg/dYygEmBI0MJ2EPgelI7X1qBd4DSgepRzOZxf2uuzjkrGAWsCMem1se97lskH4atw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18b70119-5038-4fcc-5fc1-08d97cc90780 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:30.8139 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 07/26] avfilter/vf_blend: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3ksblEoK731H This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blend.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 73fdea3c79..47ec1b5a2d 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -821,10 +821,6 @@ static int config_output(AVFilterLink *outlink) if (!s->tblend) { AVFilterLink *bottomlink = ctx->inputs[BOTTOM]; - if (toplink->format != bottomlink->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (toplink->w != bottomlink->w || toplink->h != bottomlink->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " "(size %dx%d) do not match the corresponding " From patchwork Tue Sep 21 06:27:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137477iob; Mon, 20 Sep 2021 23:29:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzj5fO2GyxhuJvu73Z//qjVpPbNlXTuGv7+5/LxrnRSf8NHBllwBk78SPYk0OR+W8k4BHWY X-Received: by 2002:a50:cf87:: with SMTP id h7mr24171035edk.152.1632205756311; Mon, 20 Sep 2021 23:29:16 -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 r12si16931023edc.335.2021.09.20.23.29.15; Mon, 20 Sep 2021 23:29:16 -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=AfFQ8lj0; 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 BED9D68B056; Tue, 21 Sep 2021 09:28:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2031.outbound.protection.outlook.com [40.92.91.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1389868AFF2 for ; Tue, 21 Sep 2021 09:28:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WY4gC3AZ5mgQ6FND08jq0pU7D+8jIGVZgb6n4i4k9Jx0NhIMUgPV5H3xIbcrQ/l3uOdjxA/m5TE1QzhgMVHxa7lSEVqhd8ZW41/vbTmawr7Zr7hELsraeSQGFvC3xkhrw/m7Gw4ptB9/iNQkdBAPsLihb0yA+BpTyLZjvHUa57tzfVDYW9zZic1XGwArpC7szzd6/ntt1M57huaTiJcy3ORPfHNGFhk4/TmDRwWUEoVANASJq+tR8caKi6Lu4dUfN+109mkFwVTftVP7yEY2lORi1tM73PZihf4g8gPYDHZ86gjUHHmRVnAbTg9utFRlC4oOy6tLz0kLdIU9NuC/jg== 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=6IKcLCL+B/dZnyLy9As8036kriP8IJyLBYDl8ETQKz4=; b=jX9pJ7orG+uOxiNgDbOZP94F0PP4mBsHuWYxc/MOp3aSTils8qLyIVc6B79VICZ4XpfDTc4iMIQw1LibRLtamyULTKIAntCTErHeS/gBjaTJx0b2xCP6CzIapmbSmPVkmCUqpg3eP9EI/AO/s5ZDuG3uzykoHqmqChEH1Jr2x4OxTe8JZjYJvpe0trJP5qAiK4mhd6hO6HnkE/tJ9f1W7e9H3QHo3YN3efGcKqlaHsF7LBg1BmkSHoUzCnQpdq/84vDYO86gPyaeq8gh3Gx43aG8SolaPwY106Z0jE4LX+mttb5cBo7QR166ar5llB4FieUWXs96kf7QMvY+wfTfWA== 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=6IKcLCL+B/dZnyLy9As8036kriP8IJyLBYDl8ETQKz4=; b=AfFQ8lj0O2YuroY0RjcbGdlSnCRffOiQC0uDRdT8ibD6ZEY+X5gReXQlHKlyzmqhUgAUEx2fa8N5HOUwmLXK3vyB+TWJilpWGN2bsV74diIvyPpfTSkPmODTcF9QShnEMg80djs/EcqjmiyYqbUNLw3rHgne05a+DmwOkRcllfbBA1XrsfI5AWI628aA3AFqU0El2gj/F1UA+FB02yrwyi6hnTgXWLoJeDNB6sv99mdvxMSGKcLF3fyF+92Uy3CS1L/pzPrZ/cV4SuZg+hpSHaKYDwo/v1GIWaSUO1YPA9tKe+1KwAkXOEDGJlEUX9KvBe7M/3t90JKgEq8ZkLKd8Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:35 +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.4523.016; Tue, 21 Sep 2021 06:28:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [P4zsKJyZlphnpKiaLUHRrWHj+f1U88RE] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e33a2357-2e19-4978-a379-08d97cc90a38 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSucj0dRBsjmdz/GDU8Qwz3WiK0FCXUePAB5i/1B/i7n8ePy3yd7eSDkG5VA+qCaa0C5s5IfAaqBw/ESwDL8gxUBG9/nNdXhJgzIwseaJqCGQBGE5aWpCFK36jC1O7qEqTDojNMbq/KYip8JS+wuhTX0x9K71Cqeua7YNGXxE10eh0/+BRG5BVLu46kp0NUu7QyYQdUHWEGjFQCsesS6/mi+AwfbX2ff0Ym8h7UHXbwatjbfTT8gN+dmIoTc08RVhlPbheXylUB1+RX9vQWw+rSMO0A0qn17XPaCGoxhdflP5kC8A/1E7whQ5mhEEUieUeN6WxRMKWaZiGJhFWDokyoqxRrmmWVQS0cq1/ONJW6+a3AghkV8yJbtE5vjhMl9pHyqI7fd+FbPQQYylz3Za+00Goj34TQAX6C4PwUR5JBdQNHzWVne4lDmbckReg4yzMJN9QAPLJCTSKC+y2jqXiilJ99U0SB8dKI93Yk9Pds/0H5F3ZwyCarp3ywqzRW4iemSVXGd6uB4PxSgaDY+3RXiGdIr+N3QUM5U4htg5XcAvqN/qA+3z4st2p2clyXzsNVcOOXOhsWxo2i4Pe30jJXxMX1yXfbKYbi1dj8fSCCI9G2SdHo1SY0TnaaGXgxYxniVeGdNCiDwvQAJGvHI5iuZcKS9BOFPk7luG6KAma6s81FGy2YoUhQEJbAl4IqiDxr7bytdctwSOvGTRmAGtNZsI6jCT5OgbcgyKvAbMZPBw= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I5I0SqErIntFSJr3QIOlejc/tmoLrjMi1nQzVSK5iVHdNPslbr8fvVVK7bOfWkKwXsTMBwMRdYYjZFNVhQXUGTQtIN4bDN+BbKWH1kdQsLSFlo8CEYI9bmd50Euteu4FE5q+e3Q9HqKhCMJgryShWhJXD0wWlwaAAzoTC6sKbdMWS1ZXfOc3gD2NKQb5Ege/RvZPspPqlVuzGJWEt2i4yhUAmlTkIAB6GVzOGrRe4gvlvO+4oc0J6Mi8bKwLeLd2NvV2UcHZCGiCGhC+sZo8Qhd8gFyBO/evJTZkFKx7TNWqTmFHROvHURK8r4yEyh05ftsYeMj91tYtGAYmRT7EkTBJWp1pHgufENtYY+KLxJhhlLUM0Rq8K1XKw1LkXKxsFFOLMEcbWf6WJ0TOViby9iHg1fSz6IYK4qj1kFdhy3Xa03SpBZcOu+h0lGIi687z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QKxymaHHObCsScd7jPvltRUDtboyKEBfNdsH8fD5RTWuPgvtBFRaFdOSL0KxHdKEWo+w9WJFrDN7Rh8Yo3FGWDDkPNu++KLA5Bd8HIvQQQ87AEnpPm2L4x8jGoDPEIm5H2QfV+7jtW/grADfE0RmWQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e33a2357-2e19-4978-a379-08d97cc90a38 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:35.3720 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 08/26] avfilter/vf_bm3d: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Mc1XtJMnul9E This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_bm3d.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_bm3d.c b/libavfilter/vf_bm3d.c index 198fc43268..007f8bbf8c 100644 --- a/libavfilter/vf_bm3d.c +++ b/libavfilter/vf_bm3d.c @@ -968,10 +968,6 @@ static int config_output(AVFilterLink *outlink) if (s->ref) { ref = ctx->inputs[1]; - if (src->format != ref->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (src->w != ref->w || src->h != ref->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " From patchwork Tue Sep 21 06:27:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137564iob; Mon, 20 Sep 2021 23:29:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2iPXNHLThx4cTj+TpccUXQ7I1dddvpECRE932i9baft2DfK1R7+qvlUHGMLhnMXZUl3yn X-Received: by 2002:a17:906:90c9:: with SMTP id v9mr31467933ejw.356.1632205768488; Mon, 20 Sep 2021 23:29:28 -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 hz24si18784199ejc.119.2021.09.20.23.29.28; Mon, 20 Sep 2021 23:29:28 -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="o/Et3fyg"; 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 3D36768B0A9; Tue, 21 Sep 2021 09:28:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2073.outbound.protection.outlook.com [40.92.91.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7C8E68B090 for ; Tue, 21 Sep 2021 09:28:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aGpafzj7iHpoD7omNECsbcQvrlFMYUvt5NJ6hjEPlL0OuySkFLuxxwuGbMvFlWIMnjc7bKCil8ADNpBQzIJeJKopO4SRl7+1Es0j0e1oa6Ai0htRrOCEYrHp6s9Q9iYqHsnRFxZDQbtbNsOgwfQb6n6LwJ4WvE2ozzH6QuK8DplDQijLw9+ExNKdMlQ+xErq/dqwQ6VkpDFrgSum/mad11Zo+Tw///Yue1njpIcvulAMIiZbrybtFkBzntPSbsqSiikP52n676nWdo/dWVDH0tkrp2cPXXFGK6YT6fNGq0Pc3koFxV/+iC9HMrJg0GTrJYBuIadmNLtDd9vAwSWx7g== 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=LLgD0EtOMh3D/JMOVqkZvMzBrNCxIa4kP2zjwyvEV2E=; b=hBshozdv4TSJiAS5fIHH8wHMaN2Y6LRbGpeNJGsHR38GBmUeIM7DPN5XzoRPJEX6GuZ519HTXR8apPoXCxIQWJ+0IjfjmKETh2yqspg287h3AMARCiQoJFxS9fefq7IzDi8E+uBZYMOpZAmotY9oP2/DpKdkoa/Si182+Ho/S5z2/Ow8qsd3+ErL4Ez8Fq0+mkRJEYvVP5mXshrcOdjohtyezqbWhRX3ZPK0FiMVlwMj0pcvH5E0UTVDp+u3XGysU309AXOTIyh+DIiqa76OEezSLW2MGrIajFJ6uGFNijYOi+Ihl7qkvY9BOQ+pxOSVPa4LnhNEDVt/k383FhemlA== 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=LLgD0EtOMh3D/JMOVqkZvMzBrNCxIa4kP2zjwyvEV2E=; b=o/Et3fygYylqk/7Cm9qcOGw3Ch6OlI/lEi/VrAB2iZ6aCqwQgXOpZG07JEmxeGjT75aZtKqyAW8LhQ2SHw9hC7eVEci1DWrXBLdh/BfPHV7JUHmVW/G1SW5uA372A9Nvzt3QgvW3qcz1/YK4ytc4bCUYzomFKyHNzlrGDcVGY8vLaoZypQ/SVMtIlTF3M2NHmGZTU97q2CLgcJO5ApM9q07J8GgurZ0RljLkbQ6o6473rrVdi4VmQ0WVil3pwW4iwnJYTK7oVsWcoG2xEM7r6Rs6n1LdsG73bv+TGex7H9BxMxzcI1772PAMtIW5t9tCnhPqCBaT4+6mLwsrlMwXaQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:41 +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.4523.016; Tue, 21 Sep 2021 06:28:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5RHI8SnOmlH3oW+gjFN68rgYSKUYYaL/] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fce150af-fde4-4d0c-4e2f-08d97cc90dca X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqS4MapTpdkRlFvkoe4Rb82Vo07UoIbwJTBV3sn2DB21qpYeA4Z4iAwUfAjWAaL6HsjsVaW/2ocnn0SfS7Pso6SVUGxfD5fbM5C302OSXVtsV7wHFuIWlzgmursWmy79bPMIL/cGF2QmuBT5VF01vesOMKq/vX50D7flwBf64S3zOsSfrn67XzTk5Hh2GGFX7M8ZbBnD5MxGYggHn1/k0+P+mCXiEaieJeANHnU/+di24Z372edvhB6/TMjRdvg4IzF1JLZe5kvjxNkWHBpZMuJ0JrAiIGlgtQWfUorS8WhQkZTgHC/5Gu3/FgTeScwnzARON+JjDORCfcwtvcEKkBaeOTmZg73IIIhjFC5HXuwsAF4IlHXX/7gNHD7H750yZFX5Y9FaWQ9IxxpF1qsw34iSGvfMrVWpjDsmx3BrRsZuJ6gvUlA+7KOSorP5s4hRHyy+RJpsTaIxOM93gmQ+fKJErbjAcLhuCdNYI06062p9BE3pnrQAVG1HQkULvk1MKzuYil9+iZH6B2aG0YCJJ9PSiQsCBM/59dgzrE2na2qPNnjGREZcQX5Wm0z4yBK7psscTWZyzmXKns8PeRERUdsRksjxnrspl5G1HjDOvBR+KFumfssll7eY6+T+0+mwSE5OiwseQ0YSOIHe/ye6OKQJ4AzQ3TvafJ+P2czVPAZzQYrlOIhVqxRngyT+ZVzZxfx8VdfDhwc+sxPy0wKum9PiaYZzlqhEBpRHj1MZ2OyNKs= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MLVroUUGfKkHOqMAZ9PrWTK/n81cMPipy2JUV2Pz8W9e+15THlwQx/9triAujwP0YtyDqg6Wx320I299hsY8U4mXg5XFC/frEjfwQexoxRPvmG/L8zMYR23pgV6g/FcXyKCW88fXjhJFi5p3EXZpjskFud9K+HOTMdqrqz0Hiwd72yMK2xj49hVlgEMSLehgpInJNE9sk0s9tApqL+qmWvSgpVuAFW6lNEUE+PTZyyjm8Hx/5MktiYaMuoWnRJMGskSN9ieSmVuobzLPMf7PlZ3ASUPKv7vs0L3PoACbV/Z5LnftLkvrFcpZS7xGYoA8cCITQVQwbqN2fS3/0XMRJN0UdwuLHaycYNZqLR+YhV0ztfcXsC27uha05FQ3WicuJqJBGhjYJO5jyDsci9cR8lu3gUjq9xv1h/ySoOi8tvt5FzCwAPAER1VLhRiLyFbR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hWcOXT4a2xg59UywHC0u0PjwFZiAWnL9Bi+1lorsZ0my8fu0oiniWkbCk2ONkln1+9EYEzSHYO4Rx8u34nF3qfOenxaxkIXZ3dDVZVICfXko9SthcK16BkTBgkl5CryM0ZV48MmVn8MzXSEKu1Xiug== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fce150af-fde4-4d0c-4e2f-08d97cc90dca X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:41.3787 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 09/26] avfilter/vf_convolve: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zXTLqwvkmY0D These filters use ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolve.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index ab6d1a271f..70d6793a50 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -162,10 +162,6 @@ static int config_input_impulse(AVFilterLink *inlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } return 0; } From patchwork Tue Sep 21 06:27:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137642iob; Mon, 20 Sep 2021 23:29:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwi7C1sb3rksw9qIRxNIv68BeawZojn+9A/UuII3zl4IPj+bkymH8fq/nhDlRTE6jEQLwB2 X-Received: by 2002:a17:906:8689:: with SMTP id g9mr24960266ejx.91.1632205779633; Mon, 20 Sep 2021 23:29:39 -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 jy1si19213156ejc.592.2021.09.20.23.29.39; Mon, 20 Sep 2021 23:29: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=Nn8vJ6LU; 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 6422B68B0B8; Tue, 21 Sep 2021 09:28:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C71D768B037 for ; Tue, 21 Sep 2021 09:28:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PgH/eLePrFuI3Fxj8fif16LeC538iRHs5vP7gvPg63RVol+0j1QaV0sOOZla2E9y6ebHRc7InVvdxMmSpRVRcUX67Kf8JmploZw596mYFrUSgGY4iMcts9GwnSTT9mNrjK1MUMwcNMb0GB2rTY41WYC5u3dZAP0uGPnDB7Ruh2dnifmT37M7wGaCAsoMM7ns25b7GIb/WmM3PG+091BYlQrYM3P1CMnnLvLE98hhETB9XtvflwRcYT2CPKUOEW7k5jcrtq8azkhT/HKsDHl3njVPsFdsgzH9vC7r9trvpBVZfu9UiF76D+8/AU6uY9HwNlGZa7XtU2vyP33hkn1jfg== 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=jvTUXjsK3aQkt+3D9wTN2Wa1e108JMRYsKUaquIL34I=; b=bEATMVGgOS5T0rpY+pVkCt0UNaqAJpX55bKRe0RxxghAvp7tYoz9p/t5xI6QAKGqUgvL0Qb0d68WCIcrOGkBAc8SyCyfIZllcs3eyqej0Z6GHWiEiU0ZRSEKzJJDxTc7Mm7VCIUxAHoR1a/qy1tK/ELFK9qFb2wtH+AhvrKKd8TczGHhIg0BE7a5AKPbIOuFV0QHrQ0CiaiqwIzigut946jukBvoNKs5bk8WrNIniZg+zVD1w/PN0PH9VBhziTyD1hdz/ZNoNbNAgd8dDY+3VF/Hy7nDYvA1IZirBjZ+b9XWPi1zFP9+wR/trSUyu9zYjsPRs+vaQFipvRSuEEu5fw== 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=jvTUXjsK3aQkt+3D9wTN2Wa1e108JMRYsKUaquIL34I=; b=Nn8vJ6LULz67Z74R3YY77MOkwQtZ+ZkDf3hA3M84uO72hjb9a9iFk8GGvE3HymKWWkWosDOqpmRdhe5C42WuE9Zd+qOk00QQiyk2ee2T/zbVRqZgb/hd5DpNrGRby4jQBZLIlaNRQttSN9FEPofKteDDl3xilT05FT3qtowTsUrVOWCylKKuamg92Grytz5op2SiAgwyn4tQ3JqHV/yfy5r+TJJJYLpW/5K+eAbS7MYhUI9GRzoB9UQaB1VEgYh1gyHlOMvBefCuj/RVfnSblFBiMx17/Iwn+ONkgYi9KuCklpRfAAmZDDD32skjvvmxSVmTHx1n57/o3ftZubDvJg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6264.eurprd03.prod.outlook.com (2603:10a6:20b:13d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:28:48 +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.4523.016; Tue, 21 Sep 2021 06:28:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [o+D1u4QqU1W6/gCj9ja/EWTwMkhDNphc] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a8cf96b-0743-4b54-7bf6-08d97cc9121a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJpXHh9ED89m01tfHKtW1mxTLmbU9ucIzjAUZlIC+1k3eFcwMyHouVdy/0oJ5E5kz3iK7uZl+UaRiEqtqox7p6jNJcr3/zWhOvn5mV97N/rJ9fPNnM+EWNLCcHieQxrtlVOuELqHH57NogOFUJnLXyUbWgyQDi5o2Fk59KmrPhGFQ8ytf9TvLg/XUlrBCBtEwWWFObh7YKYkqr94dJLCMooUXx/7pJ61NChoAdMdx+BCi8UXO5LqyO4llZ2zE2W6dkO2HgtkgPHQDp9agWkqicbZjAlzm4F8o12wBvhJmpMaXj//AvnCtrUAfxAGu/23jDj+ZeNdwujxOgLjjVnPn05Iawghvlx7m4h1UdKPSwhZOn5q8jInd4PJoQUNduDJYzNIrcOmBiqPRZU1SaQMhahEyBIqLoM9Zx6mk9mzbDa24rszoqVZI8rdH9CBmPcVJ16vknaEA6u42QZxj3dx2Y4SV/t5Eh3IXXvnANCT1YPxdqyblHyABwxhpXAzEEAFaYQ/VxRKvR3TK2zaARJqnfHdPiLJMBR2fQ0DQJtaRqlpFnaYN2XviRtEiIaL4b/+az9V16SiDgK4yrpfVi8zbdBOVLM5nmTHD5aXL9m92lGqH0UwT7v6sXYWN+iPCoLJdxp7aQBWEPBTFEdduPUZX2pTQR5HCPFacNyfryVbOO7yCfZeKrnCsiTv2Xz/1tQng+E= X-MS-TrafficTypeDiagnostic: AM7PR03MB6264: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u4fGFeTlm5y2CgCyVNyKlUgJPRLMdWT5KyOgQ3SHsCL/4Ozl50aVIdiEgilqskmelATbib0TkS7anRmnJ2pQ302gXr8zk6auRfgZCfm/h9rt/6Secgs0yzvpNLNA4zEJFXURbFiXY3ZswfTEsx7uGQUgDaFcNWtt1nQSaaXSW7aBKjU2pgL4DXlY4Aw74rPfqlopdrJ7zFiXJ1wJG7Utp+eNIZZtRSGpB34Ec5xOGJFItaXK2/xigX9XZHiVfmrnQE2J7S9wuBpKyKp3aLv6DLFietBCZMQi7NY0b2i3mHIlLPXXbWQHLvAD53gAe77Pi/bN1dERT+C63YJXB34yjqCY9252nldhtJLAGDt/Q4Ops0lfmUCCEnKcEQOJs4s8Ldrt0aDQwXX0j7TnM0qKqNYYYr3ErxfYCSt8z2G3zu1xSAKXdWSE9P2aE4GRV6FQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1PNY+vQ097wIK53xm5SKd4XxZ9eO493BaUoldozgUmeYDWr5MdNnzBqGhg2RQntldtVpqI8YJNCc0S7dgr8775/7WcgPrWpZwtP0qJhZ0fCcwqF5h97gaXMSoDY5DftR9WwaL4RE3Trzve3uyIy4TA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a8cf96b-0743-4b54-7bf6-08d97cc9121a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:48.5882 (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: AM7PR03MB6264 Subject: [FFmpeg-devel] [PATCH 10/26] avfilter/vf_displace: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uMJ5vmDiwxpk This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_displace.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c index 0bd35b2516..3dbba3b95c 100644 --- a/libavfilter/vf_displace.c +++ b/libavfilter/vf_displace.c @@ -311,11 +311,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (srclink->format != xlink->format || - srclink->format != ylink->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (srclink->w != xlink->w || srclink->h != xlink->h || srclink->w != ylink->w || From patchwork Tue Sep 21 06:27:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137717iob; Mon, 20 Sep 2021 23:29:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwofyz7vdI/+50W4uD41a6pifWRMdPDwbIIpV6XrfpUWNkC8/0qfUAGpqZLWS06Q/DC1iu+ X-Received: by 2002:a17:906:fc09:: with SMTP id ov9mr33165542ejb.128.1632205790595; Mon, 20 Sep 2021 23:29:50 -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 6si25128361eje.339.2021.09.20.23.29.50; Mon, 20 Sep 2021 23:29:50 -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=G1yCuC7f; 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 788A068B0F4; Tue, 21 Sep 2021 09:28:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066069.outbound.protection.outlook.com [40.92.66.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F36E68B0EF for ; Tue, 21 Sep 2021 09:28:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cMxqz3NSt3VBB4o2NVN9pxQqTsczxccxju+3emIY5dnqaLRD9my1f2nLtakAmwSecCA524ko7stB8YGbwQO9osiFbL019DilYrldUOe8zZ2uZ0e6Aw8CUuJlag616+1hMkle9i9HX3iuF7w3rpphW9hT8ziq6iAfthuG3/9QS0K6mDFIQbzz7/j9zb5GkVxynITpchVqJhO86TFtmqde43ricItc6cbLaQMucT93+BnhfhxULZIXtc+oLUaLOPVQd6Prs2RoDDtusG89+3oqRG61ub2yrBTHKvrnGH0GVe38C/e/mfujp4x28GtGpwp0OLHVNi27nwz1VhWTLiAPMQ== 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=uqfkNzZ+Eav8o+gP9P5gFSwnDOtkW7Y3Ujb5qG70gXk=; b=hgZcC8w0swVBuZyiYyPlIct3VQiKLUitY3vBkzCl/gitqLt4cHGo/t9ZbZHBQt/uSYeMecwgpNxQm5Xmo0TKGcSk3shDOSSXc/eAe6YiZopaYGfyMBGGlyt/EKFz31zQEXE821b7B6vnrd/KDv6C+gY1FAmlJP/XQn2p9qrKIcUzjN8m+8NkkuYG3UqXWQh7Uyq666YgHHtmwYYorkTQ76b+XHIijiUASPI69yV9OuUSxNHFuvDxIzam1Ow0GrmsJG+/+0/yKpNCGhz3p77AtYMBcjgg3UMq1kHVLrg0cnxSOACy9pTj6r5E+rFJAOXoGOOCoZ9w+FBz2GBxxPu1jQ== 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=uqfkNzZ+Eav8o+gP9P5gFSwnDOtkW7Y3Ujb5qG70gXk=; b=G1yCuC7fVR5iAodc6cydDHLgSppuuKY5d/B0lUyN8DfpHMk0NQJQklqCin/8kdVFLA6CLUO9s7PpdXScRlIKqCMhTT5U56T/kpC2sw5PdPmmhDBxaVjwwCzPFp/f9T965r0EfITw99b8kQ3CzdnBavMEX0mSy9hSjb277TB75PDHNdLl3VoryxCc3NCKqYYcb4z3TKy+NF4M3VhI5SKbGFq9KdVcMoY0bphmVN6tVYOB8ZD1jY0FNx1+BQI6bI/02S9sv/UrSkMZkLxvI3bushRhL81v4U85k8xmbZlJ2fL1/Wfw4TMGhY/sJtFMsduqv2zR18sPKuLDYdS1HnydkQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:28:52 +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.4523.016; Tue, 21 Sep 2021 06:28:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [U7b2+uRd4A/ThaRbpIAeTa6atXH3MTQ+] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 298a501b-7173-4a4c-5ba7-08d97cc91490 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJpXHh9ED89m0wgUHJw8xFFr3G3X+YfmCWOkgaZFqYqhQq+XG108wQSoF+leNkBi+BgE/SvpWBTXwvl6m/SocUci6wCHzH99l6U7JwUBUNORGZwY8pqOyylIPu60JVSyX6OEzliRK2BBRtuD8cp3XwH0LrTkzbdk4dEr3M3xUM6nu+SR9njuyjb9e7RXsVW4qZVOcDmt9zC0q9V9gQrYA5c6UvY7glIsRxcwL4l88n/UZ973Dm70qO6ObJ7x6k+uzPDFfJeLbYs7fogcMp0LrpelEp0dn26ToNkM+DIFMqTjUJNjDtSeC95Qn2Xxv9Y298KVGsQn0bTFxF7TnfXwimvLhI+DwtfKAm9Xbvb7eZ45UBJISQP4jep1WO0HErslw2TdcO7mmVbWOluIYKB9UDZ7oWJt3W0/P8OKDj5f7OPwPDv0i4Vf7quFgwyf6r4z1NsmKhjwxxdr+oKqa5FX063oNZaX2Ij8zhUyH2UndBL7KJeXRk+JiD48t0PoET9vdB0hqpHzVAK3fI1T7hF/L2tPQAYg9/+lK+vF6ogrdPkVZGQj7kLiJOeXKJMbktpOZzr57JtUiwEtg66Vq6TFgPtDndO0noX1pv+eTG1TfwmX/IilHrEr5JDh0pBNpaO0K+DRJx91Bg4l+kflCOf62Q9zwOL0AGYe1IBOt4JPG1ouda0+lysQ5vyduqmrOFtS4VM= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RtpUvYRe5pMhxSybYBcnziicSCWqCvJ/VbtvsZaz91kS9nG68wT6e0HgDTI6BHZ7K1626/sfkaIxearXKye9C4nyIWK8psdIPHjXUTa+TNdZVihYBDC/Sq4TJJxGCevHiEN/Qg2CjNfSL3Mr8+QalW5siqqd8Qgqppy+Ovv0pTR6LALN9RakI1iWzSq6OFkEUapXozavswp/zjq4gZw/OEXRKDSh2R7I9yBsi5xxn9vGE8YytCew7g7HQkiSq2LdvqNYQFaz0arXpspjrFbLaCqZcK0Ktf6MKlnYs1qh0DenHVXy97A4mCFhrRwL61ilEqppr0eN+Onu0yLx1fVbyQj6dgNVsTxxBeLPb/wkockznkWxlSRswtN0mvf71syUKfma1CkKoFQQhC3xKbD3xZW/ys1nDyFDcCSb0C1iYFv41r3kAcNEk+YxqHaybm8W X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GFWl45K+1ziLNLxLyAMteOGpeCSi0WUGGv0N4WaKroMHiwKXLOr0H6ROMM9G9sx56k3aRPNvUYhUIhDenYhftz0YrXEhOK2e6r0NrTWALSLUx5hwj+yLKmjBGgV50eI0zuwXt3NzX9rdJu3bxl4TEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 298a501b-7173-4a4c-5ba7-08d97cc91490 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:52.6982 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 11/26] avfilter/vf_guided: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DvvP2b77jFno This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_guided.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index f808ba1043..bf8be866e6 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -367,10 +367,6 @@ static int config_output(AVFilterLink *outlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } } outlink->w = mainlink->w; From patchwork Tue Sep 21 06:27:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137789iob; Mon, 20 Sep 2021 23:29:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdyb634LhLawIVmiYa2uuQZZIl6fKKueag4rLbGqi89NGC5BSi+t7MPONQ2g0xjKKjqi6L X-Received: by 2002:a17:906:6dd4:: with SMTP id j20mr32435890ejt.316.1632205798904; Mon, 20 Sep 2021 23:29:58 -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 gb4si14842428ejc.246.2021.09.20.23.29.58; Mon, 20 Sep 2021 23:29:58 -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=YuBKKqRr; 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 86AA568B166; Tue, 21 Sep 2021 09:29:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066076.outbound.protection.outlook.com [40.92.66.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E4F968AC06 for ; Tue, 21 Sep 2021 09:28:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S/Qdwen+4CebdVu1BNT0rsSMaLjY75+IAgHIJ2sJCCDwoeLuajJbhwQUNTT//zvVRzYUzDXv002jziMFYTsN2PDCk1IHgl0CD5VpPBPLoNeeLq652v5QQF3Vt8sH4aniy6H8ZG8rvjEJRpVjFMmsIdxAi+NysrSbGMOLc7Qp9O3na8O6kITTrzz3cXQolWXT7OMsWcFkkeXf8sHfUdDjyjdsV6TRRrDhHcifpF261RL0Z7OOlMZVYsOba4ftwacM9z9lCfUJR9wpn60fz4AqAZnc+eqc+aV+5e3c/cZwXq6UeSWyC4udBexFo/1h+13wSCONDvr5goW1+N3PlwM46w== 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=hUE7pHTjucTNAf4L3dOFK4W8tZG3g+JGZofnCbMx3Cg=; b=mOes9TIlyJcv/IfILuCE2tL/Tt+4dZNmRYtYVYv9R72a7gu0Mc7iO/UPeepa8RZ/6Uq9kHYQ8HOPeYW2jhabUsuPu8qO2IDIVAjDfx2LCUT6JxexuAyOZ9B30TbZOg612vToV6BAXXtnJJ/Lf2JpFF+4zV83nYZnaYvz0+qzeTxkCgTpjTVNjak+gtQiIDMVNvBIKAQOncEWQRXO/bZgcpE8FSCbMWgHpskCtROae/y7aTZBI6PhxsoIKTLR6KsvLFThZ2peqcOUHI89LsCLwcvedA4YQL/pZO1Y96yvTd/KTEwZM2p3Rvyos8LqllvPab9PATvm9csGDk3IBXzovA== 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=hUE7pHTjucTNAf4L3dOFK4W8tZG3g+JGZofnCbMx3Cg=; b=YuBKKqRr03ZZf8UP5MDx5TUc1QldyxJZZmSIgZQo0oiaGn9I0UCuljsMhl7V9HCSaFqp3fehyUusc2ATqESbg+qZu4gg3ZYi7QesH0NO5UebaikMbQ/o8rTXQzxKEsIqIG3HbeZxmiUUtrAokNb5xTvYsYiCnwkS808xNTZaNN1UI+k6TbDuP3OLqbvRWKpdppGpI2zNmNVTO3fUe22BI7aYf8hEqme2S4jst8qEhCzodAu82Y7QdI++p91ugDlkRuquRE4ee0DcXBuZUD7EjC6IW9SOzkIg4lJ9jJcV35WJCQA+XLSLjb46q58G412uykijT9kebfWPrX7XB3cQ0g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:28:58 +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.4523.016; Tue, 21 Sep 2021 06:28:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/YxoIufsBKzcJf0e/sGiMPndoJHLb2td] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:28:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e15bc20-e8b2-4b74-7b11-08d97cc917d3 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIZU5J7cCMRV3mUEToRhWMRmZ9AU77RDlwb7p4gowAeuMJH6eYGfrMeI/HOESNEPurK22LsRjw7TYMEOEzpcGqT6FIRvCKpv67qWHhlpW3KgLEbwJ5A6qVPf6BHMRXJcVSXIKWRNCyzyKJQDEEQV5lChjEeeBqCLnuH5Ef3nhMybZJzHb9MmX7USWV3RG0Q0kFnas+8szVwrRx7cLFs7N6/lC+qSQqyp4ybX6gdzVdxHIf1oXyCpwcA+ej42BFpDwVrOC9otHH3hW9g+pG3S2zJMnRJ0X8lnbcjvS05jXDldRibLERU/c0TcEt+6FryjRiLe/C1R/BbEw7zsLfLNkAoFCMzjqhLwIFa46sUiUXmvJnEmlB6SAS/3KBTQxM1M/5EZJjyckrGBL96BDOHVq6jSIrM4e96WoDf8UsNx3clBHfbBIz42aKqxM1V+4CNT6r6HX+C7+fO7JTp2MRC04P2dMTV8RrNrZekKdv4QY0kBBRmfH5DZiI1YC8IE1ibawIJK27XkLppcU+TCJaanmZagWmxRyoEFjUBvXKGr9BurTmN+I1lz6N4nq3sta6kPSGVAWMJNTa9oA56Bsqe8chZSJr/dP/YEZKQEAMmHw82SHi9gJlN8QJwGpFsdJZHNuutkkOygpS4ghOEVansgudshGX+qP+HP3tbjCmPwat3OASKBua9Dh0Tw9rbDzXD3xj7kU1O6v5gWA== X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +Lrc38jXB+lpLnHDYUpAVH+AI8n8B5l+f4vubKs+5XyzDV/scj3HiOm4DQjuttFq6mHVzzh9O+tKYHQtphEWfhXEtArVQMBNcY8FDHrjI1pDspx8jGWx0AL/Wd4WmfQ4gA1pcpLXud0pPp18wE/1fKMtzHNra54Z2y6ehHWYxQLY8epfgU5MWoNkYTD2SIz8ZRoSQBmEUB5FXtPDUvnrEyl+0fG8+FvC2pgSvxWfNw4NsWIedVzku70WE3zi289p9xNvGoiVY4U/hKCqlQ0oXHHtdf1n0fcSfb+2habx/IQzZsmdZqoS5wr2n+cP4mG9yFw8tjYzXIcukuAQIjLYOjErFtPIBkRnKWql3ecjl5CtgUqvVAtjCxSGm9n6qNuRFX660NwiupTQKYigsZaE1hVjNMqOXZnXRNWzpSFzPOC7cmtG9VpZQo9bj4OOvZiO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QTlVBoYrCbjBHjXBzd9yt3Xf5yNnFWkEmY2a3WDudNsSnyJsC3/0Poch/TteixhJr553SPf2Vm21qR8iTwHX6hOMCog8g1B35OLLZO0hZULWtggSNbU0OIkFRKZZEa9sOOJ0rTTjNUchN6Uf4jgXtg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e15bc20-e8b2-4b74-7b11-08d97cc917d3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:28:58.1922 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 12/26] avfilter/vf_hysteresis: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gzeiFg7STj+a This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hysteresis.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_hysteresis.c b/libavfilter/vf_hysteresis.c index cbbee2691b..0346465e43 100644 --- a/libavfilter/vf_hysteresis.c +++ b/libavfilter/vf_hysteresis.c @@ -295,10 +295,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (base->format != alt->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (base->w != alt->w || base->h != alt->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " "(size %dx%d) do not match the corresponding " From patchwork Tue Sep 21 06:27:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137884iob; Mon, 20 Sep 2021 23:30:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwyn4Voc99lAFAj+fFELj11Dmqv6Pf6v/jZsWJ2pDOPz/uUTw5qa5pBj1Nw7+OAdbHwYCk X-Received: by 2002:a05:6402:2c9:: with SMTP id b9mr33538593edx.109.1632205809202; Mon, 20 Sep 2021 23:30:09 -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 e10si23970020edj.362.2021.09.20.23.30.08; Mon, 20 Sep 2021 23:30:09 -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=krmKxYDV; 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 DA2A168ADC6; Tue, 21 Sep 2021 09:29:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066101.outbound.protection.outlook.com [40.92.66.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 892B268ADC6 for ; Tue, 21 Sep 2021 09:29:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HVhJXaHTxM/PcWWQQaxYNPx/l5mwaL8m4VKHu5BNOkMLVc5Hx8DpvePovN4koMZheSke2vlQbE2l15Ir6Not8kdhwDHk70AcsUDzfdK/Z0pGiBFcu6Sv6b478CMhtTOnZVt3trvcStHeDTP1Z6I65y0VGv+23b7NSIe1kXvri1UI/P/BR4T9QB4VBcUCTAz5j0lZijtRMJ6FV6akxyvfK0R6DJB36dehYsGjbfmqoUzlbCep/VlscDLexZmZVZwMUM2QGBLWfpCw0z1ZQPP+KR8MlmjEwA/fD2MdNamwVqoxTbmuVWrAd+dYUMbpSHiSzCgayEC4ob2Fs4XnzYLdOA== 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=6jGHoQUs7H53zNR6pbMDOTiIq+G8pJfQRFX6C9qh9H0=; b=cP99dYmMBM7FXlJMeslfy3MdhMycKMZ0ekUYZG203xMNgTMn/GpIjggdKrzcxE5p0oCQ4YOksmeo1lGjirjCRzy5cVcQU1hvV080vR5GWXlDNTIloSmBo7fZbiMTWLh+2npza9lWGrmAVssJHeRNNQxbIAndDxj9Kj/6Qu2qKPde8HyGMLp96eigqjwV3Tkp2jN7DnZD8KQCy2FFJ6clDOQo6nGOZRYot3cJHBkstjmL4E9np07QsMGhyB3vRqVo57JspKOQ540vnMgtA8wVlNTBoDbekZ7k3EJ9w3Ue4PiiBb4qyObhh4xJsrMvR1vjA9FUsjEgxfgVzxKaKKtGtA== 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=6jGHoQUs7H53zNR6pbMDOTiIq+G8pJfQRFX6C9qh9H0=; b=krmKxYDV7MvxtZoyAAg+vMdLVPRfa7JKi7xjwPCNb66kQgxG/oT6zHu7JYdbX8OfhuP8gC4OkXO7EgnDsy5V81X0pW2pIh4XFGp6jzeJ91RHXn/NnZ+BoSkkeJq/Y8WAWIZetGf2i4d920Dvr3pv/FMb55JktykJ8M4cTijzHc3i64R8lsyIKPPSyad2CmeDMTX0KIn4gkh0oHyshbTF9JvG0twp6qWFxjp/gaFMMAijkyo02GTO7PQ3b4XQPQoopvMen/kyEX4x+QNM7r7LOoZdwZY5bkLQ9W+DTp5ahs4uHWQ8F1vgsfhkIJZz0aSr6j6lrh/spaOSgBWNNTb6ig== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:29:05 +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.4523.016; Tue, 21 Sep 2021 06:29:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [TEUnSBJXaT8nBmYHFQgku1njvPuNujko] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d262efc-ed29-4625-4db2-08d97cc91c6a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqS4MapTpdkRlFvkoe4Rb82VrNjkPpqHD/GZiLgZyMqFLxlDpPU8sVBmNgIzO0EUCLLRcg5AoiO721eF/dINv9jes5P2XCkx6GPb9KkDqz5HTnYJeNJ70Y279P5uFDrTqYCbWlK8tCiu+8MnW+lN357GUHLeBlQyiEhE65LnIml2fhthVRC+RdaO8/f3MM6uc/ktulpgi7YeB7ilqUqCeaUwzXtIDOTTwuU7HAkcjO+uj2RE3IK9k4OK1rT2CzI8KM/9qnS5kcb/g1uo5sxOTJKOIpMq9YVkIHZ9loOL3LykUTxVIOmQM0LnxC6jZAmQ68HhN1YWNCS29B3c+/WN0tQC/uCEGMn2kUMC2llSpZ5WKwoPpAk8dmoI+qQ/KHOPsguBlZ6wigUQWui8NFr7Uqne1lE3mm53+ibHMJavqNQcoaRt0T6nOw8/OFPEf13m0V853LYz5cw3K3cH55QjhChE6+xJi+6by0bRdy2GbTnR/kMh6AS584bi/eWIRcKlrhe884Ehff3ocRhzUcfyCtIEijWTj7kqkMoomRbIxmcnNFAKyS902QajtNk6O/xqx4iwSyU4FW1cYj7XN4pA9uffNjYmV9NLv/Un+syGvBEnGg1JvfaUruEFp2A8aQuaoWFSSj0cvhAnN0MdyWdW7dEdC0j3fAFCwfBVVG3hudDqoT+qZbrTxlOtI4igX8MGWGQhbV4B/gZRaulKhxWLwr7JYJJwDfXjyfIZEKBBWZv+zc= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rnhZ5MWgNm4V4ccmJpiAQc31QLj9DCRtmieT98Abe/VbTMQxlIhvv2cSAos3kwsxBGz8b5trHjqRB4Q9/nNB/6cLf6gJwMNduzPx+2kCD5syhloSSblNZ2fVALqj6ngvqE88pTqHnirB4raB85sahe4x5i6R9JMJBdhomts6IMokw73Bzml6GDcjZbI76sZAqdTLXyR46ToiXcDjb7UQsQq7RHDkHg3xwfO5h4nWVTMSNeHJaMJ8RukNrqx84tEBgO/eYNmRQUAFyJMsueILRS6HBwgaX+1UIgIGQHbUTKzEQjokybEKjXqwkC3Z/+r04XB3I+BQetRkUanEYspEo8cQl03Y2uWtXuifSgT8NJj2eTzAksJOrzYPFJrcVhpSqy8uDVnYoqz2ykv/+xdSYUzpmGnTvLa3HbHsGO4AWK6So7EazbB0urKrfzDt0b56 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ti+FZt1INaEqoy0B4MlMWeDsaKCOOcjaWO9j9mhEJEyynl/wJcfgYWW1FcpTxAjOBrh2pcIEOWyT/fER8lp4Y04dQ7Kqsh/eSA6COjispW5yn80MrvEXqRZohJ3qUE2inNPoFxbgRUgvjIEsEwz0A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d262efc-ed29-4625-4db2-08d97cc91c6a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:05.8835 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 13/26] avfilter/vf_identity: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /F5x4tTbwdsF These filters use ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_identity.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_identity.c b/libavfilter/vf_identity.c index fd72137344..5f0b4e9834 100644 --- a/libavfilter/vf_identity.c +++ b/libavfilter/vf_identity.c @@ -274,10 +274,6 @@ static int config_input_ref(AVFilterLink *inlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } s->is_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0; s->comps[0] = s->is_rgb ? 'R' : 'Y' ; From patchwork Tue Sep 21 06:27:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2137962iob; Mon, 20 Sep 2021 23:30:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7lqrc+f1pDsoHPDfQTOAcKLbKTptqpNU8QnByvBUcXTDFIx2+KbWQdV7mCoSD93mUDSje X-Received: by 2002:a17:906:38c8:: with SMTP id r8mr32081014ejd.172.1632205820042; Mon, 20 Sep 2021 23:30:20 -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 p17si18181198ejn.242.2021.09.20.23.30.19; Mon, 20 Sep 2021 23:30:20 -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=ukysoC2o; 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 EF1C268B195; Tue, 21 Sep 2021 09:29:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066064.outbound.protection.outlook.com [40.92.66.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AC9468B182 for ; Tue, 21 Sep 2021 09:29:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gJp7UoL+O4DY+pNHdgB7yHGdZHxtt2A3EfPUxoJ1tVxuBOFZT1NtiezjH7bcpTfPA3z5v/EFCogMD0oXi2PBRX3qZAqHcicVEd0HSgo/TLJmuV0E0gMGaiu8E0+mRIuHRf3BjsCfof7R54kt1bYyNuNOQ5BWevp2BLFnnhvf+AvziQn5t33TtBhdSW5a38qY4hk5sMSqtJJzcDdet4zn8l5vCZJn+zf6bt9BNwR5w4sqkOrgUiyEvvTsgXJpO6wemAWy4v3eoRFEc2blROsNd5WteqJB4VaqJICZXT0ybsKDZQu4SjFuA8A6dh8TleeZiAvD83k5WxSdcJ82YskVPQ== 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=OBc/qqBylGks9WlGbxXiXdJcWm6DHLzh+ckg8mdOtps=; b=E8HjW9YtiVrdtdEaZptikGs9DoW9RwR0xHxgiKdOGvEG2aucV/uiayJcZGQnIWglzsph/1YtVuBpDuFFH/iM/0rzwgYqkb2tWozCgKvPKF+lE8SSzeh24NJUsOQTGMUkilhvJa3kTihy0cyazmCODrSv9zq4T0DkBbaZg5p3CHftarOvvI63cilC/o7+LWPNqQQAdiyrs6uY/wmxSfu7mVQCL+cx9Zvy2Gs4Iku13wJ4F5XoD6gY3YVad+ngcHr8MYbtap3jo4thAHtNmFJ8fD3JvnkAc2AWlXMbMAn7aUOkKJ6dhoKb/iPfYb7pZzIbNrm7XLus6rct2OjqRTAHTQ== 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=OBc/qqBylGks9WlGbxXiXdJcWm6DHLzh+ckg8mdOtps=; b=ukysoC2ouF5JnXO4T3niIEg9ZCMezd6Q9RGvRXUCqBmbzQUSE24rFSR7VqUg3OweXNA5y6PhWpO7QNl2FDpDzgPfeV1n3vn1pXG3Dw7uNW3VK+mV4cFBhrQQzaHZoTZDc5+6PxLt5ClJrqGsf+ANpekzOehMDQyo5lIkB0QmN0GSPCBXUpwwwG4Uf1el73/5NriQFttrAqRfzDbBiuFFcuWVFmk4uLRWWrIPmvAAhimso2WjuRQsPRGG9Jp+Ed6gtCRhkPjv6BbqtNjHmVPrNdXu8u85H/FhodwfxMyJ2Pz7jaCw6OeunV9456/ZafSgBM1bi9adjbcOnN97PVQxXg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:29:13 +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.4523.016; Tue, 21 Sep 2021 06:29:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [uv8mlSW/hQDdOAPEMZZryR4KbWOupt7x] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d079b67c-d41a-40e6-e44a-08d97cc920d6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJpXHh9ED89m0+oIpkPvpSK8fHnKcpTXyvY1n4sWRV2QNTt6BRARkmim/CU180GTBBURip8OQETNOOjeitrGs0ycUYJrcJNnTCpW6tyoweBfGahTPowzWFGUHxNIPUz726r1tTQwPWnr1jcUibOOJineX/Q8lDt3ClLdsEPcqEa7ScaiJKuvChvto/Z3SmS+zzlJ/608O6YmUvlVnuF1ZXHmGTAq1o8Dgm1i3cklXEyBl0aq3MHkrcFdYpa5+H0JiydbOu9MLl61f0M5pVYMBOTAf/xB5qKSjO0JNb818jrUUYb98EgmCb2yGe4Nl9TkfqkdmR6qhrg12L7qMO9yx+WdbfEKLowzqWCoccRltlqVZyT2EIK74qUL2ZCQ4NLCiZv5NBjzUewdeuQNF62RCN8tWLK65UFKIRf8RygQTGpKa96lXTQ2FGd0ght1bik84H7NHBngHeZ54AyloUUrD2bRFHx/CULsdFw3igAD76yCBgV08kRmG8uHvzB64f+MDSuikHt8CxgXCnvMIfHzLq1bDd+54h7k/EtXKhkLb+48gWoIDpXKz5aV0inJ98HmLq3s9XrxZqFmd0NcBpZXgm6jdr9pbwzpEXgXbVu2IadpTz6OfJik+gmTj86+OlikqClNASk6Xrf7G1ttHl00vsR967uIO+BNSHssp0zjWI1QzErditDkCWR/gsn9X88AOI0= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4M2nLcyEDQjz5WYSqr6IYcRvGo7rNA//lX1gmc7FLUTp7DYY2uxY3aKZwQcR86//01mydaRBFH+BChVDwppO7v4uXYXUM+zU8ggXiUDHDiFihPaeYFgRxb3AO2nwnhNUM2FTMQOjAN5lIwZ+Zgs1xXjrgz7E8OUN1QfWCWGs3lfJp7BaS/h0FivQfOpEpj9xjTya9rqc8tiM9tV8+66dZfE4iQCOLGtp9k6COzbM1iZ2KVZMSDVNy0geqwBUHVpF/FQXKPgOI6RJCRUcFseJRq+7UJmTVhzmUOYO49cKoguVS/X0cOhgPOcHtNtU9BZvGrBagfj29z+OQ++wJKh8LT2om9MVYicp98tDTvAvvlgydaE8XaMk15612IhmoGFkvg9KXZotq8oqOTpQoKrnXfCqh/tm7NyJTSilN1M/WVsglMUgKgF+Gas14JWHprFY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rejvEuefH71Dfmt/kz0em0t2CzpXFqg08n1ACV1KV+kSYdrdjk0WMRlc0nsHfj1rfuEX5VBpxoNqD4IJxrBI4zhR+hC2pflKsGBTnw9mIJhw+ypPvauiSs3IfwFwO3xBLQwMKxuLFUnTaXMTpgrfGg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d079b67c-d41a-40e6-e44a-08d97cc920d6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:13.3061 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 14/26] avfilter/vf_libvmaf: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: meSxwfndRiL/ This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_libvmaf.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index d3e9f62e33..00b2661f5e 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -271,10 +271,6 @@ static int config_input_ref(AVFilterLink *inlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } s->desc = av_pix_fmt_desc_get(inlink->format); s->width = ctx->inputs[0]->w; From patchwork Tue Sep 21 06:27: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: 30420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138059iob; Mon, 20 Sep 2021 23:30:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGn4pI5zybZ85+OZo6rj2+y5890/7sSg4dDsKEDdlmk4ZzIRrEkAwvVdtOhTGK12wU8Hjo X-Received: by 2002:a50:aa9c:: with SMTP id q28mr33057166edc.199.1632205830693; Mon, 20 Sep 2021 23:30:30 -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 au25si18302345ejc.360.2021.09.20.23.30.30; Mon, 20 Sep 2021 23:30:30 -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=O+77QW9m; 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 EF8AC68B1A9; Tue, 21 Sep 2021 09:29:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066070.outbound.protection.outlook.com [40.92.66.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 506A868AFA1 for ; Tue, 21 Sep 2021 09:29:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GggjW08KjHMHqQpFNOYGJcS/ulAvvsLKbxuSGwC3rttdsK+jDJ6KMPbMlNt4He4lloT0mgg8VLG+iwg/w4uIIgpWPmPgti6HFpx15361QBA0godLym5zTIzdN9QDmkKzuU4feBn/dE8uQJIPYhBcQVFclGgziDPmNlgZT+WA9Ije5X9/z8gJeCw62jaSfruy43XgQGE71fKFs9czzLRIytiMIAII/QKDw1myHy2izp0I8yvxvyLS62xB127rrHa/kQM4l1N7Ephw5+qMW0/+nEdqoijYN20H+ORYgncnhisNeGCAmNFP8mIn0/Hq6nq9AanZTTjMflIOuiLYtJ3fcA== 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=jcMhpszjRci9b+rhULMP+1x8frRiskDJHjiONWlt9uY=; b=gPTnbfGa6rEymclyMXun6DQvPg0KnWdAfKS5uwCvNY41WZBOUZWJBDK1zMwxqXXxOlQ3Cz06VOkoqQVVBOv+FtjiN5NTa1m17wZ6M3r0hdfUq3xHFo2AZhrwI645L8NtMf8TATOOmWLKtsmnKx101qybD0ThMo6UEuA6V1hI2lfPkQ5YCNJGY5jvuoU2eAHjBahhadUXY/dbaAQV6kIykRXkpuwTbDWxqUAuYvKyS49MBGqi3es0yDDfg0H/LCInA/ifHFSxNe6IBUGBhaTjSRyMni4eH1Q6p8FAQc2tdom+L6wVlHGA+Oi+lAJfDetlyV4BrSqeOzmiIPjWavfhBg== 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=jcMhpszjRci9b+rhULMP+1x8frRiskDJHjiONWlt9uY=; b=O+77QW9mZlZ4Mr1Gt1juolFJDJT61no/y8MvIA4EHikQh9HOXcq7JH2LPJgfvGbT4qrE0/zH0uIbfbVHmthCRo7jAOdOxekYNy2M5uJQYHK3WIdPEFisuxT4DTR0hWdmmWhSng6PtunaX45vzok5HWjbaZwLY7CuwbFigh0HWLOYMIMMc7ZPisGk6IdHX2lUZUnSDR2J6hc2SuvDYhgIjIW0W2ntNSH1PFcgXpsi2VvzOZLoVyr9cTJhds9RaXKxYQ7Qy+Q22LyD0usWkAwJ1GNO1YD4hfzX/qyzp3zb9vXttTcJ3aXDSA2ZaveArM8R8BQbCzgl8Vuor0qOsEK6SQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:29:23 +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.4523.016; Tue, 21 Sep 2021 06:29:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [t4O3e5ZKVtl4dYmdiRdEOeCSbwqVEROw] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b2bf11a4-41f0-45bd-3c1a-08d97cc926fa X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSy7CLvw+O4+XFQCoCHiXyqrEuoNE6qOSOB5+lMc7VWEhBpOJMFYGo5iV+fdBDYgfZ+LUgOJ9YyIzxmR5Y+NjRRZeVyV68rqDsZhSIYXUXIPKS5Wd9Pl/qpga3h7Cl3blV11cJ3JYrFUo4KGPlZuQqAYrhLX1Q9ZyV2B/cSwb9xG8z2PyVRfhJIaMX/OvdWwzl4AG3ptt3VsrpujIyTJueLQyE4XNRkVYKO/SFZw1UbH9e+mYrhY7/Hf3bJFW3yUAAF59dmNKHEQTjWJhk0crr/r5XPIDGLPji7Ji0xYmlb32xTzDYs92+B3KQAGgcBvFu/OxLt4RuNT7Zd2rXuAyV9IsnTm2UGmgEbTVuv8Q5+f5/WcN2OPBxIedCOrI3T319IQ/fuQtSnZO8nQgbehGsOhr+Q9Vb70mrSYqWRD1ClbCGLvgAjZIc7LGVCeBqp2ywbwI14KiYqDrt5cR34Kl4YC+ZBvRASZDWDvLmu2+EMcUCoGr9YbtFg1jChe+EliF/3/f4k9JVlklTDxwwOc9Izwqmq6nuxnv0dHi9AzMxUleGrEeqDZ+A+G+0/GUfCaq85gHDJT+JODB/BfuB+KWO+v5JESLFqM7EcJHiy1us6MrJUKhybr0u2fE6nnrK/AQDKG/3UM3FjeIW5Faq3708ZtXkpiY9KnTP4QW7MKTMpPSCUO7VK6mB8yK1xBYO66oc4ZTf+iRrWOW/nnZgB61kAnodZcsOMP4h3tymweKCHxY= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kz5CHvaACK9d5rvrLXHgHCPJbMOEb1tamM5SXeAWq4+ycNfkWV7L9Lv01Hx4lWTzTIgaitxY/RPUCt/gexwJXSDQvFpYvyQv2bYBbupNmTqWsl9JDP3ivTkYmCRWkFK6nl8mmS4AN48YXEQGL3SP5LucXpLmKMWJnd2UbXXbx0DP25rteFkz1dJLDm2x3c+qdopzdYbtGucE8fD2UWryweK/rHyxWn/5mxHFyDqs+zNR7WhMPFQzw9tNnP17Gqnk9klA+YqQ5bFfk3mAhrE0tO/3WIDYRqK4Zcv+nXeGPYNVRaMWpVJt+gKg26rV/aAn4hzfxUg8ml/R/27uxz6Ez4kF6oOvFG202nVLaHk5Uh4jJ1yXXzvmIvkax34cm4DtrXsntnvbXB27HeNzovHHO6AvUGrB1IbR3ZjhQAn62rCjct4DQNwhJRJoHAkuCop+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MDvJT8JuLvl09skajKW3hdGESWP72n9BaAeMrSzTpMQtXKMd4eskc8QHuLKq/vSCeQtz3/DzD34kC9YldVWyrbbjeE4sYZ8z08pmDVHnhFvdyEZNyAvmjqmAV3iyZOdRS2fbZ3ycTyJ/xcyUbqsXNw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2bf11a4-41f0-45bd-3c1a-08d97cc926fa X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:23.6160 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 15/26] avfilter/vf_maskedclamp: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sdfElmw8SOzH This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_maskedclamp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/vf_maskedclamp.c b/libavfilter/vf_maskedclamp.c index c19bc9d849..f46c5c9934 100644 --- a/libavfilter/vf_maskedclamp.c +++ b/libavfilter/vf_maskedclamp.c @@ -230,11 +230,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (base->format != dark->format || - base->format != bright->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (base->w != dark->w || base->h != dark->h || base->w != bright->w || base->h != bright->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " From patchwork Tue Sep 21 06:27:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138151iob; Mon, 20 Sep 2021 23:30:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxz0JnBq6n6VuFuJznCxW6f2iCKu3BbW92VfwR31YL8M/pqerl7YUFCuifo9d+1T8eMpjJ1 X-Received: by 2002:a05:6402:289b:: with SMTP id eg27mr34697682edb.25.1632205841648; Mon, 20 Sep 2021 23:30:41 -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 w2si13512071eji.36.2021.09.20.23.30.41; Mon, 20 Sep 2021 23:30:41 -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=RtQAqCGa; 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 0124568B1AC; Tue, 21 Sep 2021 09:29:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066070.outbound.protection.outlook.com [40.92.66.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 750AA68AFF6 for ; Tue, 21 Sep 2021 09:29:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l0pGDOHDZvyFoxMiOR8pi7ZIRu9BJA5Ldz1Q8pWU78da++o5sxAp5cqh3PT9mlDlPN1ZzaeA99gQcDle1lJvPHH25EtGtarOeT9/CRkaWz4vsiw66Kio+SCi33qlmkqieHh3Ml+tT6ppudHnVsjr1ObdZICg9IMr8iGdxkldtdXXTGebB8MVfJ+s7yT5R0r/4vZg1pj7HsGD6o/phMdgCY6SIKv1nXS4CoWtocyN0QfHlLP8ptYc9gHaYslSOPMIZyrbW16ndHWsfdl9JyTrnTpUoKrx+ast3sj2lyp4moUqdQGdEnfLz8+DpcrHDqNxAX52EObyLwmAPMwUFI5lzQ== 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=UppuKveSkLdAIbMRgWscUpsLk4k8Ed2egUwE4MvUy+M=; b=QmMN0fBSZsfkcjM/QO2b/wIh8PcARoid28FM9fkCb9sdCvC4BTMmfYMYgFkJAeEsxeYvUzzh+pM+uOI2I+hXGJVs+caprH9JgBpw1yTk2J2NpNVS6Qqgatyx4wBjpQ2OuhTNcvWY4ffwg7hDIknQvlACDvPgZh45lFyKQrFKpqQ6Z8OZEmMLOYVVVT06G2FE1EZamhVU5OWF4S/cGbmojzu2ItepWaUBqxEItZIbTZNunfypwPaQ4heTOvehyWD0t94hnCRX7QVgWPZmNnhWjsp2JH9gkoKGwMJ0DSspyIM6NTRETW1KEv250rxANVkA7THVk6/oI7Fpa3TYzPiM9Q== 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=UppuKveSkLdAIbMRgWscUpsLk4k8Ed2egUwE4MvUy+M=; b=RtQAqCGakwXlGoNKJzZ4zP0xcKMIheLM9WXOm3IHU33l+OZ1qTve53TJuVCX4dNngkMNJ2aNqZfWfW97nSzsuDt4XHQcmbF9eHUgvOEbCSdsGp8hbeo6klmaA8e1oQjZMarAKyEIuXGNnUDrrK9kGx64QQcg7sQbe2eUsVfvalcaYWxx6FfjWPa4M5Lz6LC3a+Vqt6y802xUCgI8HKviYadPsCmmylU53dJUUX63sUzvSxZaVYMKpZxLXew2Cf/DWv3hythMOyB7A0XBQ7bWkM2FIAaVmkpBNId+i24dQu7YIWcRU60IigS6nbu6Ufy4rcmynYDpsQQE4/xRddFn6A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6821.eurprd03.prod.outlook.com (2603:10a6:20b:23c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 21 Sep 2021 06:29:29 +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.4523.016; Tue, 21 Sep 2021 06:29:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [StuKxDPGY8KE/jGXQLbl0Rr2j1t91O63] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0744c8b3-2813-47cc-fce2-08d97cc92a2f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLU97Yn5cN52MLMrNBxjFm/CCKA6OZQib94nkaI1XrT9HpctZty7G74sXVj0oQpeOlc1OAf8cp24QTZqdSlYpr7P6W8G5ZCUl3NFu6Xt0jHZUtfiXEuVwGmuJBU1jLSjUJSP9MHIo4/ZbkUzwe63HjJ6AAapXjmBWjH8yyuG5aH7Udqou9gVSQRjpBrnK1RhWCDoYTAs5ho7cVI3bI2VaCQ9ujdDbdY30EnQCcLgl/m0WfDjze0qT9sVdWT70rKtdnVRAqf5v6lbqWvQZ6AAK1pV4HLGs8WwpAZqLxPzEwcXNquqEK/RlP6CX9REhk4rlbh7QRPCxpJUBi3FjYmnQAyUDxyyogqmqFavdvu2MUP32IFuqIioIaHw2c3ZRh0YqaeR5fO15MYTY2w5yNgozwIKQ9qVBE3O0rntYuZQh1+kEFZsxGgcrV5RsHlE03q/5Bb2tySWyvDaSwGigY8LuD37AtxIw4CO0esi+k/dLsUuNXB3qbsxncUkbdzJQN/ICu9AESHvaRJVQf/hmoXw30bOSwlVuD7O6l3l3pDsBqZeWxKiMJ2tHs3zffwU0ABcJeroMA6WfGo6Vmn7AChSzSeNakui1fazJpKjRxjnMPm/GUQFosG+sqmUgsXG2uziu/MPKp28KjF9IrSgA+deVWY3AnVMULH4+X9R3rJHTS2yFKdgWrFM8s5s1dwoNin+SJZxd8/b5egws= X-MS-TrafficTypeDiagnostic: AS8PR03MB6821: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bxM6uhXSlnuANFQfHj0IMVgWS4Mh9vs0jpHoo4WUD8B//JqbTyvxczygKt/qSFm2CIYcQsc8cl9gSmQjmg5titarI5LD3iecZ8P+D/A4H6cMnKsRaUjKWZD0dmoUWwE60SauMchyfntb8yqV/QHwYeli1iX7tdI1xBo+2bDVeMZcSNlGhnx5FvPIy7cgdMJ0iWFckTILqAwzc8PO8Bqj6nUdIRXLEYe/JS92yiDL0AVxP70qaC1qsTBVob/R9aHuoPdVrvOngoCv+5NCWPMgkILdFN4pXpGIriMTJqSXgYFOvbudm47n1+PyXrzVJxh9tU1bvjR4Bj5Nw4ichXR+M60XaoXe5mWa0ezqHmexjyaIy5T3Sbw39VwcEENdLDOZj8m8nl2u5GAsIArjGuOVsSMLKmP0J8o1v6EIT0Pe94rNIxaVmL46V/9/np84ZgNP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oPAEnjuQo8UGSyjlUDFtJXqkMOwLgX9TMgmpvUJuWKzUWN9GHnCEFvTv9cw647oW7m7NaIZuWQTEPmfvAlEpHdXRsKkqWBpv3c7PwO3ILcqxmV9G4dJnRUpm+77Gp+qqfyPKe7aZE8cxPW5Q07qm1Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0744c8b3-2813-47cc-fce2-08d97cc92a2f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:28.9785 (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: AS8PR03MB6821 Subject: [FFmpeg-devel] [PATCH 16/26] avfilter/vf_maskedmerge: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vCqsdxoMZWuP This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_maskedmerge.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index 00e9308622..26b54830b8 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -228,11 +228,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (base->format != overlay->format || - base->format != mask->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (base->w != overlay->w || base->h != overlay->h || base->w != mask->w || base->h != mask->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " From patchwork Tue Sep 21 06:27:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138250iob; Mon, 20 Sep 2021 23:30:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZLKihsZlIjVBKsTmRMR3ODVU+rHWhXm5rREj4bYIUpAjdqubJUJTkS2OdhBDevo2/c5uZ X-Received: by 2002:a17:906:32d9:: with SMTP id k25mr33299764ejk.290.1632205853660; Mon, 20 Sep 2021 23:30:53 -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 h8si18198615ejo.303.2021.09.20.23.30.53; Mon, 20 Sep 2021 23:30:53 -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=pvJvICQ7; 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 E0DBC68B1BA; Tue, 21 Sep 2021 09:29:39 +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-oln040092074103.outbound.protection.outlook.com [40.92.74.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18F5D68AFA1 for ; Tue, 21 Sep 2021 09:29:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l0aYmpnGlblxjmIbeq78tPM4ffn7naVhCz4d5u13tvH5pvXMNOy0tUxdbH5NNlAPcgeAFSZDq9wRP82+v40xQNCUD5DpiVOY6sWtdd3+gy/1I8OywylF7TrJmEhr2tQUjxnCNkOI80UerGyw1+EgXdsFblxCmteDezvT72wG/jLj/abekHWy1ZLWOyjKqTqus7wP42NkTh8KEX9igq5aNxmBtoCzwPHLNPkhC0oZZR+V4+gxYjf3Peuuj0rUZcuoCKIcHxlg75pS2jJ86W+bD3z2UkNtWa5tbxj9z8GERRBx+2C/q44F2FJviLmIy4Lv8iNKWHwWMTLTqahIbNv5yQ== 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=QKMj3Dw6Ob0nFQE/Z/yqVZcdv1mqqPESPFL828RC6tU=; b=Pp/ZYDYgxOoX6QoMTX07Cgk33hNkf/G0LLjaDGzFi/GMRuQkfgHEir73UIw6doTcJZL/rUZOodkOZS0GPP00mk3NW/SFxlOKSXPs9obwLfy6sCO73PItl+8hX5phIqyYpsp7WOt6Y1obxjEPcJLJM7fIxfExJqnvXh00nsQElksc6n8y3KY0W/JEGGFY9iB6dD4o/6x3C58E8GdWkA0jx7CetK4J57Wm4psb2XdVUzXbvImJVR68iAxBzZywO5GE1275OdQrRdi3iTlqqBJ0H3ulv+pQ6MhHt+BcEUHPSfkgcJXodWfPe2wFvBWuuCrTTJUS2xAk3R4F5P6pxMRceQ== 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=QKMj3Dw6Ob0nFQE/Z/yqVZcdv1mqqPESPFL828RC6tU=; b=pvJvICQ7YTCRIdZTrrJCiylbYylPDegHtcg9RaG29YQ6hAMYPYjHlwnJBc6Azhont7r3GPKHDe/LPinFxeZ9ShRyRxr/oSBUmGf6hXk+rZk+NUiuWChaZ3Rl9WZz+MxScW/SOSc6V31CO29ZDbXtLZJkD7XtuO1UhWq8pCfXrfTwizuHMGMzXNZhZYiSAx2wq3ogFaKzDCORKt9M3WCbU059LYHK3LMyE3zhk3HEYb18xqhcSOzzAYZ1qI3zWIaZed+qbfHIqRf9gBo/mBwPH/I2lJwJidN5jYbfy6SuDFRgh1s3O6kOtczjmlMW+lZ8XlUROzS2vYsY1CDkob76LA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Tue, 21 Sep 2021 06:29:35 +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.4523.016; Tue, 21 Sep 2021 06:29:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [SdNXqL9UdxlosTW237kRz+/pdqKWC05i] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ba01569-1335-4647-22ba-08d97cc92dc0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLU97Yn5cN52MGcVDSyzy1ZMYB6kG9H8f4txIPxR7zAZ54GDCLvGXw/Qp7+c5nCaAVY3KHMGE9bbgTetltTFRKqTewRnB7GwBvWwlWc+k3XANAjckoJv2Kc0Pj8q0XnbDY1Lnbpdc3dyHvSN+2f2O7Kd/poLdhZ2Xxru6Cw0zjpcz898yDHbBG/g1GjPouYY6A05GPe/RsJu8mWOW4T+D2IrB6zvN2bx1h25rT3sm8PMtNIOj923H8he/TjwN/G6t9gpP1mVIhgaFlHY8qt9mL1xuboGwPIv5r39c/fmMImCgCUriTTvsqnp8W/Y/L5Hcj0vabaYiLz66Zjnyq5RSeZgZMa4w6QU9XOKAxLUZIaBsv7CbE6kkBpLjsa0pxILDEHOqYJCPd+EFUZLZeFj3w6BJsEm5cMRFxMcmxILd5JXFaNJRmxLa/6RqMwJzRn2S4l5Wf3PowWmdiIn98ANkpL2MJVNP7jQkt1K8QT0fk1RVLqlfrBftX46oDZg4npSssQzIFrz4QgCy6PqEh0fu3OKI7SnsmCVn2RI7oCthvoU2nKVxhsB8/IsdlEXKm/gNibnINVyBSxkVgje+7sRwNjlXPn/mNSukUYBzOqFKCJfUgWYqAFvNJT5CzRD2eZhnXjHMmSG33C/pHkDsE07xw3s/TiNc7JUWMiY3pxeHVzkDNyrLIyzFJZSptbDbUIMvuoa8k76iyIRA= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mnAsVyjkLAZft6amRxcRHpFDdbh8eoHN1vdGYLzDBT+jFv08u0R052MuYtsorpdX/o20j5KAfVX4KWd+Qm+pQaKZ43hAYTJ7BMvEZjl/o+4uJpKg7nDL/vy3nIewSJ0AjeA0Zt9XP28eHlq30aQKO1yCAGwm/Q+TLUSsPoNS9o7oGk7fGQSSphn2QZGolS1mgG1umLVyqesY7LkQKm6aAqA2qPm2ZoJBjUCSbBfc+Ou622ULWzvPHyYjWY9TrB9gUiEI2KXF6XePB/1tgi6QuxTkumSuZzMVh1oG/AUTJPdwF3fRoV6ohqNu9OixYZXPznhBDouXmLteDdPqSozdb3MyGMezUQeWBjGdOhjMa2GHmdSAaOcHUi9Ciin9pKeu59qaxcH7D9CtgP8OrEnhz2VAkufbL6+tw0k1+i5vPCGRxYgvSvOw6H5LvxriHjGt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N1xVITJVdBIyq/mIt45TpeZ38YjmaJlkQb2thsWODLi7JDy7OfBuzAQvYmjPzIjedLcVTFrdGtKllzDz93zwGM1B2EpoCzluJUqnvtlmYOi733lnxHgnjb1laSOUOHTPkMmRMJykaPUHn//ezF85Cw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ba01569-1335-4647-22ba-08d97cc92dc0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:34.9782 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 17/26] avfilter/vf_maskedminmax: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EzNbNBjW3Exh These filters use ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_maskedminmax.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/vf_maskedminmax.c b/libavfilter/vf_maskedminmax.c index 6c7f6de211..82b0eca8f0 100644 --- a/libavfilter/vf_maskedminmax.c +++ b/libavfilter/vf_maskedminmax.c @@ -239,11 +239,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (source->format != f1->format || - source->format != f2->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (source->w != f1->w || source->h != f1->h || source->w != f2->w || source->h != f2->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " From patchwork Tue Sep 21 06:27:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138350iob; Mon, 20 Sep 2021 23:31:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5VR6eKvn+gHG8bEDDwoLwWS1ZP66ROE0v4XhQjP5XWhhschJVJNo4BHdzjgwfzGq2TyQc X-Received: by 2002:a17:906:f8d4:: with SMTP id lh20mr33750066ejb.382.1632205864764; Mon, 20 Sep 2021 23:31:04 -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 i8si16952431ejj.696.2021.09.20.23.31.04; Mon, 20 Sep 2021 23:31:04 -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=FK81k2wg; 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 D2B4668B037; Tue, 21 Sep 2021 09:29:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2088.outbound.protection.outlook.com [40.92.89.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3579D68B037 for ; Tue, 21 Sep 2021 09:29:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KEWSWv27OGC4loEEvkjDKQj2dXlunLzUFH8yxptr0cEGlSuDINnW3T0jwKH0hwWn5ot2W8NeDb2iFuryuZxtUoAyoGsEASjEM1zIsJvgdSMDErzndVb9mh+9pfuwyDMIrS8qGT/erl7mYZ+Wv6jI88JOZD+qpxMChG4llduvacvEf2BgMgxQewjvMtjTqLA++6pFFAcMqyKGDG+tL2jPErvlQbuqQa1FKLAqIgTX4MKHFlJKVsA4LPipxbFUHVf8zUoPiI3L6vsc0Dqo1+FUc4UUomeZ7/GHnHCKOzAEoQ6MzM8AF96u9l3Il4psv29xdenzg2PNSMZdiJ6M2lRuyA== 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=bAZ5gGbXITYXgbdxvD4B1GRifWJVo+Lzum4S4NMSdp8=; b=Py5aYFnPKGXwP5qdnGkMMZ/jvjzCgyIXtT/Ep61BuNwo86OsTe/NEwX6pbnAIJkjqmyxI9Ee70k2meOI/upOJsE3TVAvZvPOJTYcBMt+fwTqYkneSLHLEpUXYURmCvCI7GY9PSRIl5lmOY7RXb0j7e8aNSk7/jScpnSxLRn9Z7WvuFcV0xRLbziey3phtrwyi1XjYfbWGekDyFDChez76F+cdddchyH4Vwqab2Az+oL20L1ZfXHf+AdBHlRYBabCO9gW689iRa6pdtPnEM8ELJ9y0AqIzisvfV3U6zX0UuR4q7V7nzMpsasED11hAl+06YzrYoNPZfTYd4JxyoyUDg== 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=bAZ5gGbXITYXgbdxvD4B1GRifWJVo+Lzum4S4NMSdp8=; b=FK81k2wgKVAS/zaxuiEdk9eUPjDmAXx02Cj2dSaTtV5sRl2lnsNVYE/45AerBI4lCRkAU+SIQV4L1lkISi8A9shLlg2dZn6K7EvI3UzNK3LGaIfLms2oICv2fYGT3hHBrm4hMpmLncZJ3cciy4GkeS4sEsI0o0cOVhsYXVs+Rq51OaZ/df5o5Tu0NUHIvSY0OMRdf+YwuV0V+cYr3r7Vsyb7cvx6lSWm6xYQr5yE6Xl5h9bUPQCE2M+fj+6T8NE/6Pp6CH3+UWBr2G7v+lTF3ou5rJBKdsbnVYiBfSGsaNVhZQjUjee0T2WB/4wpf9T6cdH60HDC5pdr8dfJyVA72w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4533.eurprd03.prod.outlook.com (2603:10a6:20b:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:29:49 +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.4523.016; Tue, 21 Sep 2021 06:29:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [gVk3LqPgJ23P1q6am+hxqUzy4+k5CyKZ] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 30e912d8-a118-4c07-e30e-08d97cc9361c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLU97Yn5cN52MLMrNBxjFm/C58oZbOTwwezHwp0kRLP8HVFIKRYHvR4zrlOvb4eQQkcmuFJIyzj27D7VUpHKcNltzxlBqTfT2PX9+WwplYOqNGyicYzZDa8g7cQQwLR3KLPUG8jWTRd2V7mIQqJz6DQHvTuqWXrIIkHQtlSxaeKqJEcvSp8/+f5h8ebFMlSAJFykPtvwibCokDm7Subw+TfqMJ4VR4n/ZDcFbHWtsxmjDjo5rKWikAgxnxcb9l8Vku99EX8IOcFDvILa1KxK+q8wg6BftOjdnbbY5U79D1gGQi8bAKv7SCWozXjXme9H+VizDPc2g9/fZSbdF7xk5GnJzz80GIqI2X+9zxppbJrWp1V4Vqz+0PGG1sXF8/+lPceHqI9VJsRia+94KfTiyGBIWIIDUiVgGrLhVd9h5KyBvJCQQzpT2Ii6cWxV8Ktshbj6jzanoP0TxNRx7QX9YsdK1b2oY4n3TTCrOXOSma2qcb5YUtotk04lECnxBrZ84gsWo/hRrwT28jfhyA1TT8jwFKZ0PZc8m7GdcUNynpZxo28sPzFKy6uyowbD6o6aL5ttjZfic4LwEXKCTdEP1g0VM48TpG5xgd5UZuxAn7Mxassf1yxvap08hddVy8Adybk7vkOgf8Cnn0Ktt2w6GaKOW4ZKySoIr4acle5+DX5bhkIuxuxvg9Qre+HJBHREcbilmsztF504k= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iFQ7F2VqBenaWFKaEt/LQIzfFa7gCuw6RwfFWg6+siYyhUqcDY2BfQ9C94ktaVB5da1sFmhuk1SmOeUIb3X7zHMbQb6f+0tDbFuRqQ441mrB2zGPHOJoTRGa7MYXy+8qWdWmLVqEJoGsNxv99CC167nTqF6x4HVBqR1lx+bCsvgMjTKhTN4NFufOyjtWj0CH3cuHkSXig7A2kMq7/v68Il3qRnHgDkkXaBwMh41DBH0Sc58nET+DRRB0NBwYECsai0QWD1UPiizQu9Dvlf9G8a+U+ddY7e/zznH2Iw5y6DbXa1G48ZagAN5Kz3FsMQQRSdi0QWw8C5iXupzvUmoqA/FQ6lBBdfHhht/0PlJ5zfcl0A9Dh7wNyxmUO96wY0EejyUsvYURlie5e4SA9ENMTQcELzXTljRY6P8B5RNNzKOCwEmuzw2qjxHiSMA7P6/D X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ht4S2qcXuEY4msia0837CFSniaKCZ5MTKXoZDXJjTEB7/gG4A6XY6bhcWJ7BGMiiiw3yoGQ/kpihmabDrFTVV4qf5NVG7oHwgH7HIZ54JICSAKPwiBLesEQPvkQsdsz4unyJdbewF4MXpRVkY5DMGA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30e912d8-a118-4c07-e30e-08d97cc9361c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:49.0148 (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: AM6PR03MB4533 Subject: [FFmpeg-devel] [PATCH 18/26] avfilter/vf_maskedthreshold: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rcikfRvZexX9 This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_maskedthreshold.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_maskedthreshold.c b/libavfilter/vf_maskedthreshold.c index 4b183eb9fd..a8f717364e 100644 --- a/libavfilter/vf_maskedthreshold.c +++ b/libavfilter/vf_maskedthreshold.c @@ -208,10 +208,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (source->format != ref->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (source->w != ref->w || source->h != ref->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " "(size %dx%d) do not match the corresponding " From patchwork Tue Sep 21 06:27:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138469iob; Mon, 20 Sep 2021 23:31:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbyfpSa76m626DIRR7+v7Q/QylOYjIdlb+5MZ7Om2LLzC284Jgmm8Z3sJsr0HzHxUfBrct X-Received: by 2002:a17:906:a08d:: with SMTP id q13mr32811638ejy.465.1632205876461; Mon, 20 Sep 2021 23:31:16 -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 d10si20996485eja.699.2021.09.20.23.31.16; Mon, 20 Sep 2021 23:31:16 -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=kcmAtZIk; 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 D68F768B1D4; Tue, 21 Sep 2021 09:29:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2088.outbound.protection.outlook.com [40.92.89.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 636C368B037 for ; Tue, 21 Sep 2021 09:29:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l4rCQR/XawA8ix8i5f6hUfOO+q9qHU2R9QGsprpusknuvdIQzKR1yw9TxWjMUhcocZN5wOfq9UnW7XwGl+1o3EiKamstJqEO2VRGd63V2kMOPEhxv/r4J+okrmJ3ac0nOntBX4Vk/9vnkyXySgTQzFvzInzhQrOr8Nh/OGPIFP51rUraQWC8c4ghl6K0e5o28Z8ZcueAliebD2xworZmnPmTmDHNMwI/0K9cWVE7p7yp57QR8LMQVHEUlGM4VG0H6EEIGC7rcSXrKYc9CtNa2z7ccV35MAL7GdsdYOnpq7qKxCWvmOvmhemqkkuDzeLFphLEzu2U75BZLga8B4R27g== 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=6ynRb+ejcSpvYhEJTdPiEQBjsyxaMPcwDbenHabhipQ=; b=IwaVqxDs1L4UUIJiSbyUjqGPNxs3HCvwu3Cwl/SH1bJp7m8RrRJQa0AlWVExwYGOXTnic7sPNcmys2eUpA2NoTL5krUVGF/ugyC+Aphvb6d4VJaA1nSegR1xIbURhHTBC5/FQqsnc7RL4A6FQbgPouVfxFZqOBrEXqy5U9KhPZeQ5B9K9zAWRVesZ73+dunZed+/CrADr148TlVi5meYMayZGLGj9KTs0E59LfrfEAtNRKbjidvl1QNQ8HiVIVwbpgU+VSeL2h5Te3jqJPueDQ1M6BQqNXj0db6a0rhnjgMN4K2cCAusDt8sCoiljgBvqyUUgA8FGwT4DXvfd1g4Mg== 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=6ynRb+ejcSpvYhEJTdPiEQBjsyxaMPcwDbenHabhipQ=; b=kcmAtZIkiSXI9ECWMyq7lOiaRJcPCmjbkci9kWP4T+/NSQjNSixi3VbAbXQrKYebHy+MuU9QCha1ja82USqv74f9T5HqixLSOdvG2RJkhvls67PswrIKst89gHUX2a7bBJHxqXdOkOkbNGOtxWJhJbCehb051OIW7nVTw5y8354L0vJSyiCj0HhmbqSSYhv4mx7XjfujEcnQ4DXTOnW5+n+vroAlKoNQRmC1WvoLqhA/Fhty64wVaxpbJMMVgNe/mhDQAbew131wSSv0X06PJ8k7gmSODUw1eQg9TVkMH02JyX74AHePAQ9ZR6fU5YCwImUeH4FPR7VoR+AHhA8Jhg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4533.eurprd03.prod.outlook.com (2603:10a6:20b:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:29:52 +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.4523.016; Tue, 21 Sep 2021 06:29:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [U0GJu4JCHxfLFEmhBvwVXfy/CI8mYQqf] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:29:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 365f0bfa-a1e2-4d7c-9a68-08d97cc9386e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSy7CLvw+O4+XFQCoCHiXyqsKW7lWn1K32kayc28bprGg+pvDTxMAgGBsrXzMkn/ZFUsQxufMDz56kzsQTtR0rb4Cdt/hx9ft1sWoHB30DMCQbZp9MH4xMg4oeerNJZN4iv7UP0dgwRkz8zgwFtuzxeaM6PNdj6xsbFfjw/BbR59tFGzcin2dmxZAB4iF+bcH4lQJGVopGGHL5T155SD6NfaDvqbVZJ3n6kYIvgVraocNzFnEMI4YLFb/LJ49UvbgscFa6ec3geJuypqt51WrsyAch4VKtGQsB7C9Zlv4RuyKanExhlvI1jywnINxzpf+ZmSn2T7YiTHeivdrl6N7XyihxyYPVsS3SNcYk/G8YiIPaVhTZ3NLF8f4kw5f7hiqLEtHZ6mLZzK6rFIZZ9j1S189q28eGUFq02IsQYjP4Ow3eGiNUKB8L3xFwfbikiGutSzhNTsLXnw9CvF1Cf60v8pTKtKrOTUdM2KE5HJNyFZRO74jBsJh5EL6H/BlpZGi5183bDMN6Tr3MChqJnSLkjJfRGpMZ9DPLhsL2V2h9dxzmSMXxsglqeB+HC+pFF8tzPalntX40hKVulPUf45n4yE0lKC3g6Mr/h0QeVMevLg71D2KtAz3Rbx6vc2+1i4zpjDzDBEuwmVrkw+xs2hiNaGdLUNLjROBXr+QDGtt0Yi/JBVJ+lATDREFZzIOocmTG09dgBoCW7v/SgE54E1otRpuGPaHPuSqTNbm6BqCGBbI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AT1QVAgykL0AS1QNryYXEiYAvvKtlF4qKJiemqLfx+oBb06my11zzhytE4WjkvTfuKOBUkVjl73rpFKBOGEUv4+rM3e4rTTAQRJbngLqZxgpAYcVfAMtVjv5WYQ+0OjV7EUXgUHzU7cqcFSSCT2Lf8GQcPzjUBvucWpp1cvBUY+Cv/+nblLA2yLb/BtxmML6gQ54FvBzGkvQ+nhqslTPuD6+AQ1r9C/252CXVyljxTf1HyoE7SWsKRT5Je5aq/uGtK6Yo/bw1dp6mKw4UcEJt1RW+T2izkKq3KnQZyyMcGOeqb29TdanEVHCaiZlKWQu0X4v+mm0+0xICKauzAO8shb25323oHM1OmO/KHpEyOe1zIZXBSYl267wPrOHApzHG5LAByl+5g47aDVlf5Af11X237W06FbbzToynJFHVUvgosfLpb5jjjmIlQMRiQUj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DQyyX5ysmodKjRBbqBm9pb+c7sJb0U8sIgy+GnIGnVRyMo7ZrT3EmuQ1bAfxIkGXyWHdqdjkmV8H/V5SkKmcK7852D0j/y72efLJCOE3WyHhBlTYpPbuiWl+sJiGTFuZ3ghBET/kHDZsGSI8/ScbbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 365f0bfa-a1e2-4d7c-9a68-08d97cc9386e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:29:52.8969 (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: AM6PR03MB4533 Subject: [FFmpeg-devel] [PATCH 19/26] avfilter/vf_midequalizer: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zHru7Bxt863S This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_midequalizer.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/vf_midequalizer.c b/libavfilter/vf_midequalizer.c index 0e87723609..069bf47174 100644 --- a/libavfilter/vf_midequalizer.c +++ b/libavfilter/vf_midequalizer.c @@ -305,11 +305,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (in0->format != in1->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } - outlink->w = in0->w; outlink->h = in0->h; outlink->sample_aspect_ratio = in0->sample_aspect_ratio; From patchwork Tue Sep 21 06:27:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138952iob; Mon, 20 Sep 2021 23:31:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvAhK1QqV3PVp8EJdZFti7cZC0H3EOZMi+MiKrbjzUx4LM2nwP/bNhJ+WA+mKGyCij0SQl X-Received: by 2002:a50:e1c4:: with SMTP id m4mr26114124edl.307.1632205919165; Mon, 20 Sep 2021 23:31:59 -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 j11si19902749ejj.109.2021.09.20.23.31.49; Mon, 20 Sep 2021 23:31:59 -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=UaZApzdE; 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 0FFD168B1EE; Tue, 21 Sep 2021 09:30:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075058.outbound.protection.outlook.com [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 025E368B1DF for ; Tue, 21 Sep 2021 09:30:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cQu4Tmv4h/7lKAfsyu7OI69c66cY8+yf8TVoDdsl0y5Yr8pygQ2obki1qPSMMgcD3Tb685k9KNwlY5xzM1ELqht5gRUzDs4ru1Pk7cSRdCj2U7GjIgJpmWecpftSd9PZh1HddhuVdbtcnDfypk5mFYnY0o0qY4MwZ7XRdzyiWKkeQjixd0Ac85RvunEmmgKGSOVGnlUEl9DGEAns8knbVe5EMYbp8h1q0m8c/Khz8W1sxXL2sG6aUKAiMJYUBiZRuXGS5SDTCE/sv0+HvU+vwjhdKR9SSsGT7Sbi14bzC8rrd2kwJIrFdAKRERUIo0VfeK0CLyNuqs9125QecsudDw== 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=XyDAV5Mg1GM0NSf+wwh8ZCt4XKx5/GYzSoGJHEYktP8=; b=acDqtCSxp61Ebpko5mtXWE9ER9ngczjYEoBi2eiymjCyBhFVUnnQVsLYmMrEjte12M4ZKDK9N/+LxwUJuzCDdbtWL+8/9CvEMMuvNGt06v6xZaPBybCZhpgFTaEm+uMneVZol3982/oomqsyYY2S8TDbx+DkT/ZOu0iaKsPTq5JlLNdq6DkSAf7PM4yFottJ7y4Cixdvgp248BzNRGbmy3Hn+IasGANMQqtvbTBLDjT7D8ql3qT+I63Hhi5IIAMw1lmzW7UHT6alvHzij0t1/kQUFImwd+NW949E/jDyYjSS7OnuDrmyD3gatsm6pj0US5g265AQzTH1ilJDCi1t0A== 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=XyDAV5Mg1GM0NSf+wwh8ZCt4XKx5/GYzSoGJHEYktP8=; b=UaZApzdE05cQCT70Q8EsRU54oJO/ctT+JiVU0rpABEjTBcC38fkVKope5B6ViMPj5Fzq2/KbTMTl1pWWMygcHa8yLDKGjtdaeCDzCguuerzol1/OV9yLxM1EnemI1uhr93d4FraIcGHHt/BGuNL3/KfTju+Lz8Z5evcqYJHxOiyqB4zbeU3Wn1Ycd4XtJMs5pmJ652tGnH8AfUlE+dbTrT/jVxdOugdC96twgHYOFKOYRNfZXIu8CAs7hxScKBnbdTnR3zUCSY2JBKy2AanKRj/Yrs8JM2AAshKwi54PhjJYfUOAarUdQjUjHFNZfGu9KEfKq6AFdNoPvjCh5HT6Yw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4533.eurprd03.prod.outlook.com (2603:10a6:20b:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:30:01 +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.4523.016; Tue, 21 Sep 2021 06:30:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [vKsd/mH4poabeMOcNvAKJCXfYMXhgwWl] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf2e8f66-6ecf-429d-6da3-08d97cc93d60 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSy7CLvw+O4+W0+y/0txGfU2D71tstUXccN/uhlPEHi2W6NY5Cvs72qHjtvlycWHBYBEqXqQWnp7GBXNJhyNXK9wijrqAZmT6e/hyFkXkev8c0YglCbFQ02eBeDO7TITIs/rbTDIH0G8VH4r1GTbDR+ncmnziwaYWOach/qP/3HGP9q1cqtUDRKUlVRKv0rGZJAb98SpeSKvWdQTPOmaXPcGzC3mYqN1G/uVstEF8+4uB4+ySGSkKWcsis+CLNjBRGPqweX8uPuFLxHG9go3HXT/yan6psD28qKnkeg99BxxAKx5hodeLrApXL1jJB2ZssESNSCG77i7BeM53P4weplvOdgucRUs9XN6CcQ8emw+gkWWYDmX2oqpbWWeM1xqubnwDsWtDXD5hqgl2cDSlDLNwM1lof5nA0qVQe/zgFB5v8c74LbmFUNW6gEJqmiOLDclypZih6f+SY/9B4AuTZjNV0KXoGf65QiyFpohYcfQwkcX0X3NXamUjPByuTFgi/pYR8bUVO1EuoixLHAf7nPY+EjBY6T/xrYyKkxKGZGKo/vq5c5WXd+t9RbMPKSFCNWc0I5eFrIb0rTjB61/Hwsdw2K7TvdmLXec9Z8mxBPdGxKuoEykgN9pHXpsR2rGn6Ap3FwksBWIA1CAEvgEqTMb2OyDWbdxdIslE8HBUt4d8QciN+5QViiQgtm3RMSJCWCTEQ+gQgp06dQWD9Y/a6wlb9lf8JNMqpPE+wroi9d7U= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dF8er4WqMTgEV4YieyNMX2NuDa1P9x9MaK61g/GWKfV//SzFg89pehoyfDWWVRvAGXyAWAskKCF8FoRVfOz5PeEURp6pA61DAh2S99PyW3MP4+oyuurcCXhPLFW7VgwXQ67lyopvBuINpIqlDmC7TiVoQPv+atsYrT2SfhNKP0UZu1q5dz5kq6YVRRrjiOFrHlktttDR5BwAOd8by2RYBE6AhWhmY+l0z3kAGDW23XcnVm/3DZD8ZAUf9IJQo4JiKjzg4/gtHjx1dRmWA6+tCq3uBRwY5XD8s7laqViv3ilP5P1K4584mDs5eZGU0f3AAfhNyyJl6A6RoqR0/lfzqqpj0iTGk3F64W6ZyKVKpjWX94wZnn5GqkVdRBs/fAKsXcObT5Rx+2va56QHl0u6QdusE2elO7Snd1h5opdwXrpgn3GqAsEpO6EOdI+iYABd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GTeqds0ndJ7nov0anDaSO6WJ2KT1BWaY/bHOgRt/LrnyQJZaizkkz3HLHA7+enOeG4n/cTL7lIgR5nLfESJa2UidP/YpM+TZgGOdKqAF+SJSaRSw6qlp7RfDaTW0Bxlf+4KVgpxJiZwDu6BA2D2ibQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf2e8f66-6ecf-429d-6da3-08d97cc93d60 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:01.1995 (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: AM6PR03MB4533 Subject: [FFmpeg-devel] [PATCH 20/26] avfilter/vf_premultiply: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gLBnMed7wAM0 These filters use ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_premultiply.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index a76c08405c..ada249fc55 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -700,10 +700,6 @@ static int config_output(AVFilterLink *outlink) if (!s->inplace) { alpha = ctx->inputs[1]; - if (base->format != alpha->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (base->w != alpha->w || base->h != alpha->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " From patchwork Tue Sep 21 06:27:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2138988iob; Mon, 20 Sep 2021 23:32:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBDL1pZTtD0DqkzMzkE35gV+o3xkJHtSwTvXw7/jLkqKsK9WhsG8x0i9TnNE6sY1F+0q4W X-Received: by 2002:a17:907:7613:: with SMTP id jx19mr34112935ejc.453.1632205922542; Mon, 20 Sep 2021 23:32:02 -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 s19si18147093ejy.541.2021.09.20.23.32.02; Mon, 20 Sep 2021 23:32:02 -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=RXnMn0nk; 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 F151868B1F2; Tue, 21 Sep 2021 09:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2055.outbound.protection.outlook.com [40.92.89.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0377C68AF54 for ; Tue, 21 Sep 2021 09:30:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LD+JY5eiN1rV4bvqtP7AJw0bbwCT+llbZwI4Mr2Em6KZ/1qHnxqO4ZqjMqqx66ZO+otsrpJG13Raw2C38066+9UJXG/a6gO0/luwkC0KXcO1pB8q1n9yzbpwc80b06j6dierEiOVEeTPVbgCiHAyD6QaH+FiNxZNt4XPvCPeMhUgacIT41ucjwPhCokqObtHMcWW1+Xz3IUS4j+4MYqTAvZhhal2BtPkzuz+OVQqD/6I4cW7QWQ3NV5ZM8n6VzF/O1/0Q2xNxlhy5XRv6uinA7nNG86jDO9q0saeAcejeslmrGNKhU+Z//wHUne388S4PeO5SnU4QPNLWICibv4evA== 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=39U1reEJSaqZRNA4CDQ9evW6SiyRKKRLrKjybC72rCo=; b=N4Vu/HtySAdn5NYYg4wrb6dqok0NIDZFmlaJPOWAqWzDgqv8HAqs/GuJcH/A3uPk7onnrAs/8cxcTpmUMnItQ3WZp7Pw9OWFAn/oAjU3PYbUfmvAf92SzY05oAIc12PN2DhKdKW0OCXP3k2KSXrbcFCM7FLg5rbfmvgCavSxdXk1LGHVNMLRyuixNOxVyxGt8Fz7ijmduqPjAJGPtoQBCSudRseRzHMhgDybnCYTwIURpaBDWWEuL7IAIAdEc6dnrM9Lc53mI21byuo+sckuQM29tTlz7w6OClzxmLj+NTiRj8MuujpKXfM2nHdBUxK1poXdH6W7xCS11pYNIYTnuA== 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=39U1reEJSaqZRNA4CDQ9evW6SiyRKKRLrKjybC72rCo=; b=RXnMn0nkcbWdE6w4ccfZE2bP9Ha5cobcCq+QI/r68VnyZSACzb3y7mwVjZOGKFU6+Qb8KzFACj0FLmgGCCLUr5MpcZy/KMdhmCzb/fsMM38budSK+5+ABGcgATnyynVpo2Kka75qURGgwxzrWzOrKsxunnXD5SiXegjpm0FdzhSh1bKBrvxMAV6SRcEqFiUzPNWK15PIM9iXdiijGYx4HCqnhbftH+Gm1b2HkuX8RjOEzR7vI9tbMpYn4yEci4h3OiuWoe+ELW9MuTZoX429h/JUhSaEniXcM6W5su+FhkSfFudRs17NyGjNsLaEbur1l/B8T3XIJwa1Bz7p+7j8Nw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4533.eurprd03.prod.outlook.com (2603:10a6:20b:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:30: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.4523.016; Tue, 21 Sep 2021 06:30:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6FDYjpIpogRjQQ/HHxA3XR7eXZsf/2gf] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94f36096-f0d6-41b5-5acd-08d97cc9411a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLGPLnVkDQDfOQOxwVddJnuvoBSMxFaBx1CgyeuTT4IRImm09HDxUIToTOAHUynwM/lrXpqhC8dYSEMLBKdwQsT7GrZIzbuzdjgkfHT8xXSe6E0lkbu3XfLatXcdnEf+KebvuBxvUn+tzKXMBxBh3mbq5Me8PP3VBTiSqgqJ6/fcn0VoKO6qx3Y1s3pUh2cfioVLv9/rAvQO07nO8ikVBo46bBs28f+FElHNtkz3mTVTrMAK+sZbyl66hVRdGtOJJKhLEnzqmNTrFEBYidog4mkXU0B0KzmrHvritd8xde+gg2FkgIu0NB5hTo0TNjhO8YCUr9hFslHMGRCtmhoih5ZGbrZkOTgK3rIdPT1F0OF86Iu1qDVPD7ZoUP8fvYVByZoMB5mhEyRbSqBsLoszzXOxaWBIau4GNayn+KhNc7weAGYBubMj/PYvOY7Fyxqpzq28tVcaKW5QdCEetflt6KAh1FoFJBtz1Lsn8RVNlswntuSAsi+JzDTVEXHRjOhezHhL3VR13ROj5auGI8yvNhzbro3ZroPQqp8evkSvJ9mkSmHZSO7OG5IumTLOa43EIy3Zopt43iDb49e4UxdmzmgJ8HqPU+0eNNb/VscmnmFIYMZXn3yeH9pXlLSBsD/sgf2Vjb1orf/MGQPaYpfpOoJljqJ2JAmwfPE3M+O0FjpQz3fNN2w17zDfz6NMaK9ajGGEujzkUWU6A= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Z3apgcOmSW03oiDZrUvhbEC5bM/+n/qqzxb4QMo8rVKwz/mdVCe8DkQbqwVpFV/nSbpbyy0pb9Bcy3L3LuCiRyX2hh3GhjmVeCIlD2fsST5tOCoqB7U2QC7Ie+ONin8YI/8qHt/zFk25fqazLYZZPC5MY3P7QR/I2erfmlnkSNwElTk4sL+R6K2xGCvduQK9H5XdCmv++DDNLRWCuPk+cbkq456Mfkq60bMRX+eNyBrqbtUjoNVwFs1V3Lc+bgx42Kz/TllYw33/13eYUVaWZb2ThGlyDJUAQWk2nCufpwzFUi9GHWBInLKnVony9hJfgNMXKtdbR+fhcGzcvJsZ1EO9Yzvqj71YtnKnCfYBkZ7BB82bmkaFnF/KFo/ibAImKyLOjPogyf0TrNvyleFRu3bAxNxzxngB5zvdXgH6VheNaOTK4H4I6E741LFNcD2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: prHsqjr5enQmWa4AGN3MtLREumhCbMGkELTSWcVxiCbwt97bOenV2B+4vLjBoOsULxKnEAVrX5A4YbqguylGnDcwO++pMy/yhxb4UrFiIYLh71EkeODLCpeHj0+yiY7nM21gmoHKkj5Farno3x8zjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94f36096-f0d6-41b5-5acd-08d97cc9411a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:07.4582 (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: AM6PR03MB4533 Subject: [FFmpeg-devel] [PATCH 21/26] avfilter/vf_psnr: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /ilFdKywxZSu This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_psnr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index d254d0cb55..a4ce9a4c4c 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -332,10 +332,6 @@ static int config_input_ref(AVFilterLink *inlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } s->max[0] = (1 << desc->comp[0].depth) - 1; s->max[1] = (1 << desc->comp[1].depth) - 1; From patchwork Tue Sep 21 06:27:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139089iob; Mon, 20 Sep 2021 23:32:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqlc+mbKthaLudEmeBk1n/OfujHPOKtMqxpwhTJxBqBq9AtBL0bTeDejmuwNOW1M66cq6Q X-Received: by 2002:aa7:c78f:: with SMTP id n15mr33860056eds.338.1632205933865; Mon, 20 Sep 2021 23:32:13 -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 qw21si8900125ejc.356.2021.09.20.23.32.13; Mon, 20 Sep 2021 23:32:13 -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=WUP46D43; 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 12D4C68B1FD; Tue, 21 Sep 2021 09:30:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075042.outbound.protection.outlook.com [40.92.75.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4101068B1E7 for ; Tue, 21 Sep 2021 09:30:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gra54yIBKALQscX7aMN4QbgNPjOolS5IKzlX0QAjY4zFGend3bWTnXpQ52UW7iU+yvL6e+MOdcuB2Zw5CJhQvu3L3EOvdVu0SQZkd+05GKWUgjVzSN91QAQs/kMppF8OC6XhC/lys2/uPmOLtW73Sr/M1qVRMu/86s/G2VMwcMmMv0RpqhRqgYI8ZLqX9+Kr9lTHVnDrUTUivsg8nzwFBvdzIovX3H8dK7jdlTjUkLdLu6vatr9Z/3AaUSVAwcwjHDcK+B8SfVkvC30Z8RylViriuzKA0kVbVAhohps647wisWa8Zif0bLeB0W+4ThyB6MLwRDhnEzv2Co7STK4x3A== 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=49xyzVHyPM2RSgBx+xsHHnaDzipwF7Ii1Fn4/YB6XFU=; b=C72iiCMjMsvBFkEcfSq1rYgcktez6qJ2n6BUVjr4CVWb6ofQ8F8hPCEhNUrNh2b4OHOcMMOBDNnO8JCB+ELFif32DsZ/zW2rxbjomfcOELBZRqfnkvHL35OOLA7Ol52BpH/YwQ7y6/JLGzkFQJdij6p1CAJMVBmNJmB/eJY7RJXIjgjiqImgf/rAaGWrYLA4zAbBbg1fJGwWLQ6u/iOk5fI1n8qaWdJ4WGYjRMPljT0VpJbAbQxHIWFFSwxe2RG7gf8a1OuvlvO6LErzLeEXxUpEdjo/NFgJvfSOcS2g3F29lhrSWopGBAdqkS9Jo9zxzpPtiV/Apo2NzXP9eglhFw== 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=49xyzVHyPM2RSgBx+xsHHnaDzipwF7Ii1Fn4/YB6XFU=; b=WUP46D43PK7ME3qpiXfmX4A08ArqVk78zXcdQUthcVYc4X1UbzFAtjMPZchbfvXP0CmxoOI19XkI1eXIvo0+/Z6hhjmfu2Wo7gc5kx7xuNz9ZjwfckgIzNTXiat/r1xSKJknHyjD/RhlwG7cQgT1vwGgKKYUqRIqObDF21sln1e0RkncoqGoG/AzMxDP9IRfXh8LVpK4LQzEbx7oAQGaTbYSURGIa57m8dxV3GE7xB0KoSTyMGRVRQuv18jXX36RcJN5QGwHH81TO6Rg4xgPI7370mqaM0UE/7fRytEvhoQ5IxP45Vy8JPdo1Dd1vpukTqXWElibhSCG9C3oLmGRIw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4533.eurprd03.prod.outlook.com (2603:10a6:20b:7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Tue, 21 Sep 2021 06:30:13 +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.4523.016; Tue, 21 Sep 2021 06:30:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [sM32/hXGDNt4hPEiZYGGp25bTDIl7G9o] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 207c279f-8cac-40a8-b7b3-08d97cc9445c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLGPLnVkDQDfOQOxwVddJnut3aKiSFDBdXFmZWu4NTsrVcYmU9T2iqLeC9v2VN7cua2wdptMIphfWk7rofrDbeex1jLAfqwpX/SNhnAIRx9aHRreKVhJRvvfLiDR652xY+Ojdc1TOPoTkp66ifUiJZu9bSjVLo6UKK5PGpNGOeb2P0hy4dU1c5Jk+/m2u3jOH9zwqEEtBnksFvbdB0+NZxbxmByScD05Mc0/ECJSNlM6Z0jopG1CRWEZgu1flq/Ej2ZSgC7x5xkJr7x7N6C289bgn8gU0M1qjS3Aek8N549J2COp7gG0+KGxIx7AtX7dd002U7YP3vYKg9P3CVGvzRKz+EVj4DUuM+ev2ZuwPdop6DrN7A4l1NRpDEaqFQVC7C1+5KRH7+uvXGK4O3WW3h27XyUmFOS1QGC6N/zrURr6RAAhrtBhKA41OJuoGNxEP3uweLKyfP9cbv+QZJf36ZMXsMFgr6TeRbG6O9wsFKUxGK1Cwn77bb06KmLugegheQQmKDS1h62oP76mcWAm1G3cMmRK4DD5Y9GFFh3z7B1OdmMHF2qIN2H61imLhbOEugaV1u0/zmsT6eub51URZI5krNYR1jNE2jytDtqQeTlEzSqjuMIxGG4Ml1POGwBKpxSIBzcbcuw7L3O6rAgABpy9yg9+Y14fbaS2ifyc7libUel0MT7n+MJ0yBqJKUVzWAW/xOaRfoRug= X-MS-TrafficTypeDiagnostic: AM6PR03MB4533: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qpi1+/UOrMTTDxkfCYgTRHe9sWMUWbMUf+HT8B3nFj7KDYKvTK22KiIRyysePNJ/EMcErVPD447tPi3oyLoiLKLiyHKv1dMdmC8VPuC6x9P0uYpHIQqXiAlN0P+LARL7KTXuJjA4BmcCdpv94QJOaSYwb7d2smNphsNRGPNPS0+fjXQ389GKjKI10Ns1uX2GRh9DJdM8T4q8vHh5NFO1hNGl9ebboKcXQ5CWR9B2M/j807XZqHjS09kf5+WQiaTQLmuW+mRZzl4TxwtOig6PUwGbwWhAygr7VCaRk4JnakHcs9iplyZ89I5sZ26/82wNcog78Mp+BncinUWGoJeTdiDczEaxAN4LT1dywUYSbdmPxAywui0an2p0Hcig4MSJ8WyMTymd3NQ44GzuNh2F/omel07bO0i8MHzyN5R47MVQDJf/MIfj/oJwebtlEkNP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +yaR8zubNFkGE+OetNvQCf0rXVzrUBuprSm2lMkNTANgqQQJM0dOpZCulqq3SDNwr8PBNnKMQBric3cD8vIv/LtIyJqBajryFd4/Is/78waYDZGf+Vfhp1hLes1JyhfsPie50q7I2u8m9cMltImLYg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 207c279f-8cac-40a8-b7b3-08d97cc9445c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:12.9183 (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: AM6PR03MB4533 Subject: [FFmpeg-devel] [PATCH 22/26] avfilter/vf_ssim: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 222zOjYjxCBZ This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 61a84ff990..14d7ab3ec6 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -453,10 +453,6 @@ static int config_input_ref(AVFilterLink *inlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } s->is_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0; s->comps[0] = s->is_rgb ? 'R' : 'Y'; From patchwork Tue Sep 21 06:27:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139159iob; Mon, 20 Sep 2021 23:32:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2k2np+lz4VceGgMElYIpbw0bciAsHaSPvzjmhGHuGsmjOz800qV+qlhqmvxoVQrTQnrYf X-Received: by 2002:a17:906:6148:: with SMTP id p8mr33507111ejl.263.1632205944585; Mon, 20 Sep 2021 23:32:24 -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 h4si17582754ejo.279.2021.09.20.23.32.24; Mon, 20 Sep 2021 23:32:24 -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=DO5ht7Au; 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 C488668B204; Tue, 21 Sep 2021 09:30:26 +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-oln040092074033.outbound.protection.outlook.com [40.92.74.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36A1968B09C for ; Tue, 21 Sep 2021 09:30:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z6/jzYhQwxgB/kxRPDGvAKvVG6dHlZd95UEIjbP8FsVlVoSvzt0xCQcYxeXPiDdI0T+TcCGzMVPhp46yAVaiva0Nn4qfhnl3bpCug6eTG6pw7NBV5J2p72tSUCN9IcFlCb9Ls9zHaGO2am9xRNgHSPEVi1j9l6p9HRmg2zm5WQoeOPdiY5mLPmjATwVwN6wXrVrklnfvTr+5Fl913siZdhcdcAFonUjRxm5MFO5FLwAqYgK95dxXAdoenrGw1VZITZD6uXJ7aCh8VlGoK31V1WGiE0IUoI8pYq7Ey9FmrubuZdoYpnFwaG2Z552r0GQA3C0IyyunWlFTeG5livqaFA== 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=F1vNq3jj5r0eQlVBotoHJJDZcobMvsW0W7M9MxZyd50=; b=MKyZPSXLjTTT9r//eT/iHAliCO+b0esF4jYgVzuhPfB9fut2F9A7c/r77u0Nfttb2htb8O6mB7w+K8hprXetA0hYSsIupF/T5zwToYE9HsSVlES63i7lx62z3/wAy43dtnE4c8qNZ8Jo5MYZW2aox8K56ZK0nnY1RUHddgr5IuBx8MF0TZMne1mXYvCJt2P+qclxuDV9t6FdgP8mlXG2QvWPbVcAJSnl8blCsdqt0ahp205dbVnkOALa6VG4Ne3bAcGweH6Ef958wQ9z2PAeNYHFS0cbmAQRVXGe79uV7bFMThKxbSfmAEzk/WiU/sM/YsWBckMX9FV18U/oAsJjRw== 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=F1vNq3jj5r0eQlVBotoHJJDZcobMvsW0W7M9MxZyd50=; b=DO5ht7Au7YQScdEnYXVtXF35Vkj3SU0B79n+x2oZIrFYGZhMUyt0bDZOq8Di7hiDn1AUO0uHLi1FUQCDGDjC5CfAWqdvEL+O0rbJubcQDA24odZNq1molGmVNExUUM2mLRHQlYQkiPrV1IYA06EONXeeW7gzoWrxb192qo/h+YNfxwWaq7b7oXsj+3bHlI+b5JMlzZy7C2sLfWrKi3YWS0ww8BjVjHOMTSYrhFQwteFhCVBxMK22vie0+HWnA6gFJmz2yv/m1fhSdcnjEbnbqBQWSLNkPJFGhyXeMOSmYobh/Gdh1eB/Wa44XnqFtVYJbbaj8560zmSJt7cJTJXh1Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Tue, 21 Sep 2021 06:30:23 +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.4523.016; Tue, 21 Sep 2021 06:30:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [4Ugwh6Ot8D+kA7v8/8xnkESDIi+b9XBF] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85445114-0053-42ad-6037-08d97cc94a79 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJoyQtms7J4Bc4zEJr6LcOnK0tQpenttHYKTQTVlcWDmo1qJr0D/ozVExBwhEp5QRNMuavZ2Vxd609o6Il0FAjXC88s9ulCmWmsODtHX/U3Qwkq9vqtUQ3FTmePbgCZ8kC2mPh20zR5fFf0p+9TTjFYcvI4vQEMKEAlC/kt6vsKkF1bbIy/LQRCfD2mXhSNs7dCjAVToAClRKflVrNrRe+xeKEcuHy3Emffb2gXTd8kL3h02zhFzYJu4o8VN3QNZyVMeQSuEEzqrRMGC1ayPHQrKgraHizQX+XocGMv1xyZc8bMPhCeeL16x1xCKryt3XO1JU++p3/Iu29hF8gLdCSn2wC9SiEuV2CHLte7PRD35+ZRTcBTwopRJvmW0Dw1U2IHMTU8YfZGd9YVtKgHoh8svpqtQQy3nepCrk5nU0pfEbC41H0ypiOocv4Vef208P3ZnQ4WVCUOaihG5QH8xF0njDR0wBgLBmsIiYbEkKPRdf8+SHAEuKg4PQ0oNyu6K4SjTcqLMHAu1J53r68h0OlzL44jkp5sI8llAH4jjlZL7xlevBzeoArxOiCabXv1cLtYUOGOdEw634EyXhksC5x1JnJ8eMFhiLPtGCHpvKo41dgq0n5QCqyqLlwVMoDbeGdAhxS/YieWlYqEvmXLUoHelY8NWuvg6sMlkE2f1lcplkDPmBEDjDXUHHf1Zi72ZokU= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /i8NflfDPcXNVxP2aZyJ4w9sJutdiAd3TwidBsaJZdIdY9OEvKCYaqs+CSnJKPkQbK9zBqsADrsHyEq8BEuYG/S0gFAPFEfgFRlrKLynJaUWK5bq2ZdeWf7zgVEKG5JZ6ZXoPK0M59D5UwQLtoe7VIkjWvAQ1qP10bcCKb7p9t9xMOx6ufLtBG092qooftBBucM22xDM0U0e+iI9A3q5Ke0vBeeBiDLeeoWULukwnhBH/OHRef0mqfdiMwfJwSjoSLt0HqWUYttLyLnzTRb6bfGmKcZavsVJLT4KJdm3rh+lLVuduw95Vh2VpMncQ5ekrez9btitUsLmQnshevsPJrrH+IMdEvuiY40Vwsv4KtsAOdo/CVpKy1Lvfe2sGkIB1tpWOXgSoqYGkdK80N4Z6Bn8NyjzzqenuXdne8vWf6tAXuwFsJYWnT3Q+zkI0/rh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: //AG4nXiMuiWdY2ofmLywTQoLwAlt0q/4BoRGeAe8gpR4dXumRFN36r9AEwAqjzD1tktGdIDKTGAUi0tpqIQzLslx9geP9IoDqBs7d5c1UCAnRiJ6lJrDP43Jv26uQwxkHwX25JjR+VJfglxSM0GSQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85445114-0053-42ad-6037-08d97cc94a79 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:23.1704 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 23/26] avfilter/vf_threshold: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DyUqONVWQFWJ This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_threshold.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c index 828f7a8746..b6b93fef6f 100644 --- a/libavfilter/vf_threshold.c +++ b/libavfilter/vf_threshold.c @@ -253,12 +253,6 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int ret; - if (base->format != threshold->format || - base->format != min->format || - base->format != max->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (base->w != threshold->w || base->h != threshold->h || base->w != min->w || From patchwork Tue Sep 21 06:27: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: 30410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139251iob; Mon, 20 Sep 2021 23:32:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwMmKUMhmaDUXUGxQMwAx8MdgfWgiMLEhy09whK/Up/PVTwzkQBvue0WeNf10ga4J4wDNS X-Received: by 2002:a17:906:4a0b:: with SMTP id w11mr34290910eju.265.1632205954553; Mon, 20 Sep 2021 23:32:34 -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 f4si20469624ejl.218.2021.09.20.23.32.34; Mon, 20 Sep 2021 23:32:34 -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="QxeAhha/"; 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 E776B68B20E; Tue, 21 Sep 2021 09:30:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2010.outbound.protection.outlook.com [40.92.90.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EC6F68AFF1 for ; Tue, 21 Sep 2021 09:30:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BqKrGLGZm5R5t0pvqnoUGPsh4HhatHW+Bddj16zScY9kWFkAJ56y81huJCdHHdnPPJnRYHVWxctcdrzKeZqTnYa2fQRAulP0tBCnmY+7B/1XKSjmCT7+eMsGxlocmAPatMxmZL44MjorvQuuaTXwCS+mU1atTuhg7xfaz1OpdQvq4dnruvhuzBVGJ0ny6x0z1BtdBLsPMj7y/go05S0yZHJekHbDRt1GMzAEsRWXQKGQC2c7R8JofLkSIxf33G/olsPBS6sClbUI/Pg85xvJcKSXptHBbj9pjP0D8WBPNUNRbZpSEEbQsMoqV9GPfpUaNwZVmUWijrjMncwIQyBQnw== 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=IqzGZZ0TNcA/ir3WrLQvhj/0mNOIwXkQw54eDrEg2xI=; b=ax4PmimvS2JWp8zDSI8y1icxVcVqXWhqLb4H9STdopJqV/RcCEMxoSshW9smXzDPj+Ht3aZ9Ar1c8fLE2Ya1DrnqnnnHiE9PNsK9KUazlYqz/vJ+p6y9Zv7A+zxx34w/ZT9FOVNM4/a6iPtQT8PNKsgQy1B+BxrEDc81H20CU3rrfa3dOk/Vz6Bu08cqcmGxjk8GuL9vnfkHNCG8S3aDf2X2hEGSoxmN361Y7FWnXhp8i2+e2dVUbTEnxZGhEE0s5vEDOBwayRsKgLOXA+ov4SPu/WTSbAVputeh6jYAkv4w/++5+U6ZzpCPLEyjUTWD2e08LnGVXimaqV3RsR5OdQ== 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=IqzGZZ0TNcA/ir3WrLQvhj/0mNOIwXkQw54eDrEg2xI=; b=QxeAhha/vEqGFWnqWsvC36ZGK6GZzMWHvVQZvkuA0QLL9MhZ2Gj+mW5oKsSodDieHEWOLUzz+R/t7s7PZ8x70Gw1Gr4I0Z5nVTUFSAwN3QARM0HoAlDCoju10FUPliqyxQxqk3xSgWcKnPZ5pEsd/plr9SLOlRetnrhnQH6/OdAIURbn80/caNmuLdQ+/GBp27fLJhgwVBFDpElRpLOPcoA2NwrmriZq6jwqTJhlDAipebHC/im1aWpdK8boTKinvYMtdso17Asu/bm/x/xsGiSQ0ngRzv5VrDcX2bQlY9+dcHP4jXXZh+ldzx+zuZVhIlI+NwtBtv/FrwbyH5O9XQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Tue, 21 Sep 2021 06:30:31 +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.4523.016; Tue, 21 Sep 2021 06:30:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QPWdyMHY4Xf1HbUR8UWYt370MHk94inp] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 555a7695-f2cd-4885-e4a9-08d97cc94f52 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqSaVXW6ZyrwOsfDss6iqswGss+p+e9e6ah6Cao9kLrRNY8Qcy1yMxs/l8Um79U34eKYktDm/krJUMOfdwPT2wo79fkMEUX7CDtQ+Qo7ZrZ7HgiTHxMdeyenez3TAHlagoywbQf8z6GZ5tKs0Nr+VUrD7r8o2fO8pfz9akiYc738StB5qxdywjlO3OX1X7U312hTgVjcwPsfC2Y513cVX786KJeHc9ZL2BdEEwSpglAXpos9i9pfiT2cO7Nma6tEK+RIU4fXVVkBbCikee2ZMSkcC54u/vL72IDCq01OXiDD9XZeyJNTqSJsDpJH+OgCHA0YDDxLS5TvXhss63yhV3IyC/IqUrZN3+tR8oft3GkTCDjnVGxaGg79361gB07cAeHi5yOCV6lwL9cjFjrJHzD73PXTYrspYHHIopfO5k63g6lhJ8M4mcmBIeOXM48pPkUoM6Jc+jPA41DmyN9gDq4SPF2ZHPVAatnda3OYDZqq9GM+47FSHVZdl3ahADS+kLohK/LKhFdgDVcS2JCntnpkAGOnnMvncYKKe63ZmlbXkBHCZJPDrFZJjO3ZYNb0UKW9yb6jsl7NA3Fd0ENpUjyhUQqg32RQ9+FHYD5XYnyQ7C7t1UqNCMAj7E3uxizVnEm82tQeSFbI0+G5+FZeEUimAsnqYmiQKmOdRyOlelBaFkJzypfE3IMED7J+hNwGq5F7hhgKgfrhryvN9DGysDCr/9T8jUptyaR+QhzvuQ3hBA= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: //QSycarAf/n8DDjILyTiHjeT+pD/MYW+B0+9jizo6/tOItAIyZMCUiUIekCWg2fSSNDzCiZnavtUSF4K/uTmPA7SCJqsXRKU4tzBC8l2BhPS1rUgnvY5SHBUsY0Yfc9r/DEvLEIdXF8+O5LzwaeXxR83uE495/Uh5fXTy+eyfT3BzEAYEsaQ1q8FiqiL+ZuIWhuvwlbWFcOru23eYZ+Ao04esLuDgWn5JjeFTttjKAKYrVhKX6CesJs0vnZJaPHHVT84T/bWJttIRhtUbMv6UnAMCnl2Ls62U7yJjsEWMgaSTv3A8MzjJyGfm/TZA+/4c88l4dYUa0dj4prxP/zqjGkhh/xIpCLNpuBx+icTsLkbansG0CijP8ld6qwJZtYiLHD6D4WBiQzhGSRAEmSdMxUc7LuSophpnBJwbmB6Bu18QMYZ5v9B808BPyH47hh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QC9z10ZTvrEon5JTNdXZgznzhU6vf8UffHn6ofkOuqGGhDQjhpwLBCfM+Bz3yLCAD5wFC5zohVPyrY5vryXyFeixmk42l5VIqf+5ght8Vfcj2M8FMpr32o0zp6n/mKivQ6bvt4D58fOYL0mooUZsCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 555a7695-f2cd-4885-e4a9-08d97cc94f52 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:31.2859 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 24/26] avfilter/vf_vif: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YJNvz7vj3/DH This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vif.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c index da3069c1f6..ee7c67337d 100644 --- a/libavfilter/vf_vif.c +++ b/libavfilter/vf_vif.c @@ -496,10 +496,6 @@ static int config_input_ref(AVFilterLink *inlink) av_log(ctx, AV_LOG_ERROR, "Width and height of input videos must be same.\n"); return AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } s->desc = av_pix_fmt_desc_get(inlink->format); s->width = ctx->inputs[0]->w; From patchwork Tue Sep 21 06:27:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139335iob; Mon, 20 Sep 2021 23:32:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyd272KXhG+hD7+lVtZ6pcQHPpiNQcHdivIDWxOUbah0GIBIlVeBdv9UcYmpLn27gTBFR1y X-Received: by 2002:a17:906:6c84:: with SMTP id s4mr32867941ejr.121.1632205965190; Mon, 20 Sep 2021 23:32:45 -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 b88si4656348edf.312.2021.09.20.23.32.44; Mon, 20 Sep 2021 23:32:45 -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="J1iUn1p/"; 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 DA37E68B218; Tue, 21 Sep 2021 09:30:45 +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-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D521168B055 for ; Tue, 21 Sep 2021 09:30:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVPSucXhOi5NW5/Z3xn4OgBv2tmyhEOzQjiItDQNmR5/c84P9+CAmmXCavt7C35Vht52YXp5aL3tDuMBRJWZTBEyGP/NTOaoBVQ6KWzcTlnrHkWXKziPWIylbeim45w80zOb/xv5Xi0R0y3fIXFfw0qYqq3yT81+tnQhReLEegosyDbtYG9GYRPCAFRwoEaVy0RvfqreWusl6oGSpdGRbqsA6sxgAwL2WdlRLaFP8yrrxX8tsbOQqhVsnQZNxFRKRoSmrfkln6GsiCrsWleSiZ2GzRLEVp1QdRC2K7wiJ2F41tNuGoE+gjP7+Cwzo/6835hglUjxLFgKDuxxew3o4w== 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=Py0iZZo5nst2KKJKQU0B2uLP1lERBm0Hwia/88jM8Xg=; b=ZkGqyu7iOKi1FXd9Cl9Q1jB6gnFM3we1tv9kLcvleQGbL06Qb7042Dm1yF+z61zUvagPF06SX2XdaYsBkYwhd+9kPHTl24NPLATbHrqovlLx3VkZPFM9t26btVzig8Lq+JoR2M+x+d2q6L8uZ0RvUXi/uks1L9ttsp7Oqt4fDEOSAy6pB0tA1i0zvsQXPIEzJXgfT8C1qgDFdGBjRuODUGFz2CvpdPmEju95CrGyJ00jlSc4Y5ZK9zX7UTC+B3EnB/2Mt+EKze3u+1zQWLFx21uFxtZGbIi0f5fhCUEbqDC7yxiSALRtiZHM+AuKhqi/IXeABKyP4w9KrfJJx6qEAg== 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=Py0iZZo5nst2KKJKQU0B2uLP1lERBm0Hwia/88jM8Xg=; b=J1iUn1p/lmuDwbjC+zsezC+eEnx4OpsNcucVE+/82jfY4TwNlpbOnmgyTCfOw44LWOMSoGCn84AicT4NBt8dRa+bs0sV8YH66nzWR99RQfC6U0vrgUJgSP9+PdfvpliV2HLbUyEf/RmVv/CI8mc5Z1K+65i3eP9ehwkQOmLdYW8zjMWi2t2P5q1sDakqZ5CebLK4ji4uX7cE3zCixNup40fOQIujbhk2UnOamK41kqG7zcQURD2smYbrdMnyouUb1N/nyaZQWs484yzAVZy5c9F8t0sO5HoeMVT3Aj4+7SlojhjOaqpDCazr9ROKhhbTT+6xsqlYHax0Jfh6m2GLAA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Tue, 21 Sep 2021 06:30:39 +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.4523.016; Tue, 21 Sep 2021 06:30:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rMmWJqnyFY5uKSUjvWkLSyDpjc18fWZS] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 781b9bf0-3c8e-47bb-e49b-08d97cc953e7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUOze3FI6XN1geCeI3/T6dLsli7+Z7jwJoyQtms7J4Bc21iMwDZgH/tyPHK6MTYqlKihDlkke8HdueddvQ++qw8PoSRaVNGWMoPqqo0omVEm/IpA3jCC8TMkgrBcRKts8dyIg1Z7mzb2MPC+3GGNljoiiV2XZq897LaTK4e5tSdoa+cXZUWuXZm4n04V5neNRoYgDdhTSl4a12960tMSI5oKbBSPJs61S6l2F1Vl0IX7DAzYDbwgFVU8HEBdUR/YLVB87QM15xSQttXsC3XMaspm5ny3kaXcVhEZQ2sBNIBpxS9/QX2xapDgR28WCfWSEXYFKvVRwmzr0dYUp6YNaTB34cVW9SD5VIhzLbQyosPyvqcKuKi+wtBpGJa6S6pXJu7WXTy2MEq4aI9GIYsHZXrIr1MNZF3khrD2xDypo1UyZR8uOiiA/zii6clgGuUGZN6QWg/AGGYBvleHOvBz8UI54z5fG18jIsEA6eHSRXBpB2VnbpS75jZWVMB+OBoaJ7wvlj39PHp2CkwNs/WMPkl6T6Fg5EiR4WhlrGtOxsi331wi2fp/HFbfdOkRtucaZBRXJL8Ucp5CI24ngtAvdKSnyJvmlCLUvrpUhF2tyGnqircP4C2M3Eu4p+B4+W4KflUslPuie2PtlgY8VVqG/0CRH/losefnlxoVnaYfJdSIABMkJB4y1tBc/b+Fxpv/8m8HC6LZ3+zkC/0YnAutPGldZk1DoON95I= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TyrvwoG2Y3OFwh4OhMfFQnAlQ+tEdGf/YSMT2fMUY9AG6B78lzxh+Y1ckwNWwjvNspFRRWiY33TRx9PEplUUhafzWB5VG8+imfpqzcvrBSaCfbNnsPLKEuFn6+8uODqifhWwav48KxoS2uBIbP+oogR07SaBrk+Wbb7in0Wx8EN8ZtXOGMeBkvqy/Jmn7P65vwSZ/WsUEoKejz20BXpP1sUIinzekvfTv6L6zqm/VcR7zIc0wE41nEcmXK7n4NenJ31kVK2XTCH9TXtz90JlrufgLKKxe/50Jx26Jrf3/j3dZsMKA/OEeilHr+/+c7gjY7+hnV6sg7ZOTCXhErf33gYjgIP9MZPewuZrH+I6rZ75hMhAP2wW8/ayvXw9IIluSoTzGnHwKBOTosrRrEzuqTkQzEPTspK03j2fqLccj1uFJzBSu+Yd5VtA8b2af97W X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hSCoPDd6WKQ15Pyn0cRWu2CXv/U4myS4mI7u3RAZ2MjVxf231l38y5ITGguPLzMil9NcxPd2TRhA4xLy8kTl3/Mxq8XNho3kaI5s4WcNG5HZoNdfcpSVDmDLGmDaz5gCoF5TrutCIdK0i8E/z59MJA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 781b9bf0-3c8e-47bb-e49b-08d97cc953e7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:38.9962 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 25/26] avfilter/vf_xfade: Remove always-false format 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OIEjQJ7PjgRS This filter uses ff_set_common_formats_from_list(). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xfade.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index eff8a8b854..b4edcbf1b4 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -1717,10 +1717,6 @@ static int config_output(AVFilterLink *outlink) XFadeContext *s = ctx->priv; const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink0->format); - if (inlink0->format != inlink1->format) { - av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); - return AVERROR(EINVAL); - } if (inlink0->w != inlink1->w || inlink0->h != inlink1->h) { av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " "(size %dx%d) do not match the corresponding " From patchwork Tue Sep 21 06:27:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2139417iob; Mon, 20 Sep 2021 23:32:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzN5EcyVHTrNgdG2xkiZrModGYX4lI2t9N4qQrsa9fFRagIWjFyuYFOlNieRyt7Kg7hOcpl X-Received: by 2002:a17:906:2f94:: with SMTP id w20mr34292458eji.14.1632205975320; Mon, 20 Sep 2021 23:32:55 -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 c19si3451261ejj.102.2021.09.20.23.32.55; Mon, 20 Sep 2021 23:32:55 -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=ZquFyTlF; 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 BF77568B0F2; Tue, 21 Sep 2021 09:30:46 +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-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11B2568B17E for ; Tue, 21 Sep 2021 09:30:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fJm3UQHKlDrz/XIbI61gQURBHThX+sMTtxRvfCTfQr6HBgav17WFbExzgeragf7c/MIM1QOdZKJicOs5uQBa7jOXTjva4C2wGvnEcf7kniitbEg67FROWJgYz5pLxwcoqIj2KrMjPHVwsnd8+WnP5EKgwCYTbiw9Vkb1IDhum+n2AMayPw/p+tIb3H3z4xvbDCQlPJISzNSfCzvEyQwm+kI+l68790nontl3MSh41zpVJk20eWMJ5dnid0Ra75HxEOA+oBDOkudRhBUE2cZlodW0jUTup9HbsJcg0uNlN1rw1v2Yx2nqifY5SE17UPlDQ9qGBhy7kITSWy5UeiWDQw== 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=AgAogOqfmx3To/thrEWs9UkNFR5lJY28OG6kpBvdD2I=; b=bchM9nsz11ZcUkpDjhKqpicG8dYxJqKBMkGOgbMi5Ua78iLXmTqn/XJzbF9r80sAtRx4DuchEhMDtvMeqQIwpnGbEZhODnNJin5ownld7PnzvC4dr6dk72xLUZkd7/inTK2P3IURA6ilGGmQNkj1Wt7yDaByge/YTA2QncnROXht7qsIWyBdIfLqdpgfl2/PMll7KeKikSeILj6oT+3Je+XlwbPntxC0RD3HoKpPfHBYaHE6/cIZ9VPZo2dyDfxAcs3UDrCVshu2jap5ToQbeB4R75kYRBG5k2lp1qgd++p7IDSafQchNYWL1KrsOihPfCo1WexQdxZRlPqnU3JoAA== 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=AgAogOqfmx3To/thrEWs9UkNFR5lJY28OG6kpBvdD2I=; b=ZquFyTlF6hiOszuCBU7gDU5taV6accbbix3Vy6qXUkzWekrK0U2RUfaagREGXZ52z54ZX9IDfVwqBUtuwdJeJpK6ccNvxDNPfrjwQlUZg9EAzlirQ+wDrMaZI7P3yeSgTac3pDWSMkTaZTzAVt+pEVsIMijgyFCScCSiCFRlpq5GZdtmIZIzT9xBDoX2Tn5tXHGm5XWGbpvqN2R8b6i3PTQ8oO3Ne+YRa5AdBm8J25oGk7tqV48m5V75M9TdZyWUO6ibQR0MI9aluXX6fi94YKK6fPiT2O4m0XFGOk2caVpo5Qh/AI2vOAeWyMqtcFTJsAq7WNNlmH9cvhe6pDymRA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Tue, 21 Sep 2021 06:30:44 +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.4523.016; Tue, 21 Sep 2021 06:30:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 08:27:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kLqjE0PBd2HxLRXa1andAL9p2CtXnHxI] X-ClientProxiedBy: PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210921062746.3534685-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0075.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 21 Sep 2021 06:30:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78a3543c-9ba1-4a72-7b1c-08d97cc95718 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4Pkfzu6B+ggZ2FzaFiRqS2tSUh7y42fw575aGq40Xwj4LCBVXLn9UGAbZLQ4tyBKaDjwRHE2U851rDq/BbHCw2nU2EH7xXjSM5KrNSIWsV+S/rxcspW0P5VT7GaJU4xJPf0IzR8/UvhCov2jbONuL5cpukYqVzSgSLbxVmhrNEkaGxI+KWKRVQ9Vq1CqGXnTft4ekS203ljOjhGBYIXu8Q5/wxAXfGPDC5rhus5vxmkfYDXc40jy4SD7if9bEulCZzAIUxYQPy6bpLT9tfN9n6NH5wkaBPU4gFsb662/3J5Xd7AgIy+94grhslqpkxE6QLeJV9kEiB0L6RK8efxorqhRzd9lrNkZ4BXdGcZzdCffKlZwB98vAH4WONRMO4tYu/84vkqokwKYkIHa6BP8bplX3OLWGekEs6hKvVcyqHSfIZRRD0v13R01+i3yM/dw0xhCmJdw4JD+XD+LoY3rkF8SJYthhIUQw8QJBphIDMXc3MERK2OQZyJHug284hiPGWFdTWfMd2mpirUxqn1TK2K68YlwpC/pEwkFNmz96VRLSPODYB7zWzINJaKCdqMXk/XYUNkAsJ3hh8dAV/xUCFNM+8ng8yHVd+Famqm+Ax8sjqQlfHffBEoqbU53eHWLjvABjii/h/6nu/L6RNlpOqtxiShMITZ6phx25MUAcXa9i1wOgbhXRpm8kE19oY1ZgpA7MgQ9k/5AcRbJu2Ds5LBoAon0sGEAWdh6OfbEMpUxG+ClrrJfgKUpeFEUwzuM= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uR4dD5hPNIcnFm+gE22uDYEhlgaIUyr4YZ2ilRgZLlVNRu3ZdgsVxlyCfO+bhnhgBUU+s6HVMleLa+iAqroKPvBdfVNh95R2rlHitdj8KS8mtgD9l9ONRKJYuqeR+xbt9FslinWaMvvpZ4+QyK8rj2ocOky2eoNA8N9Q5q5eAAAhu0y4a7Tg5FUd6zXHj1PoTxDx52cM6nK2T37Vo53qc7VS3rqhbcvQVeOeRy9ewx7a3DPboiRoVbF3bArRTm1m+PnI0kQtcMgek1KGjJ9rszLw6v+2hfB5KqJftTGP6ZM/uLg5/Cqqygm7Cd5OK2/Nu3lx6VFznLi67oppJd8/AfOOrnrjvXp7mz54bCF98HayOFZGgwsqCHKWn/pn3hPmeYJqOwo64E98to30mB8Oex3CEBk6QLIPZbna7n1yCsiVIq9hPBycQCG5doYB+SRn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CmC8bb02UPSaeweqb340S43dqZ6U2KQN37/Mi5Gvnwxrr/Ef3RHa7vwZtW2Fmiy30HsavKX49rgx7GDieXVE1tX71dSJLU4ZfOXzWfTqG9RmtTnD+uSFdjAVrwLWtWX4+u/FDD1exn0CeKKalOBlDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78a3543c-9ba1-4a72-7b1c-08d97cc95718 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2021 06:30:44.3349 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 26/26] avfilter/vf_geq: Simplify creating string 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: EEPjI6rzWIL0 Also fixes a Wformat-truncation warning from GCC. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_geq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 4a78336540..1dc59dc1fa 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -250,9 +250,7 @@ static av_cold int geq_init(AVFilterContext *ctx) } if (!geq->expr_str[A]) { - char bps_string[8]; - snprintf(bps_string, sizeof(bps_string), "%d", (1<bps) - 1); - geq->expr_str[A] = av_strdup(bps_string); + geq->expr_str[A] = av_asprintf("%d", (1<bps) - 1); } if (!geq->expr_str[G]) geq->expr_str[G] = av_strdup("g(X,Y)");