From patchwork Sun Oct 3 09:46: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: 30888 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3288751iob; Sun, 3 Oct 2021 02:46:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkvaNemIPa1ZW0uYfWWpKesE8mqodB8Anc8EcHMqfbuRWlJjuKqs3W441XYimsi36LMwFo X-Received: by 2002:a17:906:3283:: with SMTP id 3mr9469209ejw.4.1633254408895; Sun, 03 Oct 2021 02:46:48 -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 kf3si15366784ejc.366.2021.10.03.02.46.48; Sun, 03 Oct 2021 02:46:48 -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=cgJYg6t8; 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 56D2B680BD5; Sun, 3 Oct 2021 12:46:44 +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-oln040092066078.outbound.protection.outlook.com [40.92.66.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95975680BD5 for ; Sun, 3 Oct 2021 12:46:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g9gGrPdMhTLa7jTvzdKVFHOO5Er7myRXrfxdAo/I17+X9azeRHzy8iGnmDhpd/jHxfCsi69YECr1pWnHe2gmokrgRBNICJ+Ua58cLBLqLROqrTEvz8jT/DkoDEIZdDwxFpWTdJ9BVG9pcZfDAcs1l/nKQghuwe420KLUH1buofTCu8qyMAHR0CmZE5L/1WOrGenA8b/tt/bKnYGSmSs3fZ4MTqkE8cUKGseos2i9rcGLnj3vsN0otU5bWGL0vxcFMqt1Y97ZjM7RTpYrg6+4Q2YVFLrXMpNIbHpelSA6HIOW5gKECQxp3U8Im/KFqsf4GkHDu9jn4AlaUJzxare3Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vLiDXkFewETQuMCJHyoeaW6G9VEHjs0IPcqdW6z5ss4=; b=Di9Z+GteVEjm4S66zuW0X+sBkUbmFBs8xjs246Zqjz2mB/e9mNIxtif9o6ocDJvqs/gEGvNiQD7LU39oE3i8oAD2H6l/CSM/vSIKM218I4q/l4bBRHlfkK4CoBHz/Iw5peL/noH9f/+YP8nhjBXJf/R7VE25FFU1KJ6PVOlq9xrQVlUURyg6uM+Ob57aLm9zVMUpgMSOM7dA0rWGxUF00eJvFSh+foO97YZ56bjqtQSJYPe7IRq8K9WFpD/v3IEuXLNgIIadlC1Y9x4tXBwabdFTKf6YOEgpZKXGx7zFmUt1mjoT5rE8u4baIQzMUJQQgYH3TonkCIIa9UGATQh9Lw== 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=vLiDXkFewETQuMCJHyoeaW6G9VEHjs0IPcqdW6z5ss4=; b=cgJYg6t8Bkihl1327+7iexq+UoKbj0ARysbed0V5vrc2zcJGZA6dgc3vzWFRkYEbgfITFp0C52BCgCrlDG5ZDrZFynXCkIN429Uo1RxlNo9kpUEocE+fIsgH+FZCYdsT908uP6tKGwACFKbQjrhK3hC5qWZJy3dNRbz3r73iMHUgV5TjPmQC8zGUBoCCQGmZP6NKz/PU8YFfGiU6N8KmoN7nmyxJscyM6kK2mP+bUYub9cqx+rJq+/sD/9Uqr6DN3Q3hgxrFanmPo9ld7SHY4PkRuJbe1shY7IdlhrL9tDtQ1qyeDE8hsoRYwNnIU6SkUx/ULafwoSo9c4Qf+1KKfg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7045.eurprd03.prod.outlook.com (2603:10a6:20b:292::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.19; Sun, 3 Oct 2021 09:46:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:46:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:46:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [TZgaq0DYd7nxUil+jF56mKgSoVQLw7WT] X-ClientProxiedBy: AS9PR06CA0016.eurprd06.prod.outlook.com (2603:10a6:20b:462::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094628.3416691-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0016.eurprd06.prod.outlook.com (2603:10a6:20b:462::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:46:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63ce341e-33be-459f-6dfd-08d98652b07f X-MS-Exchange-SLBlob-MailProps: EpEO96k6WolXBEtLZtHGgjziH8QqROqzQS4A3U8h/y64A8mCAEJyDScFCEKpDjNsKVcb8e/GBZGQdu52mdew2BZ1ll/wHIfyPORzgXuRzRpW89pQZRom8JkBSndtZA3DOy8G0UBSoa3G9mafho7VMnwecd9BUqVoTIYKxyjVUbgrsd8ZTI5vY/micKlI4goJNDzk+8jGqPojXqZEoqsI7E8QV4yYrZIyCGN7+aAzhbUAfm5lkfRguk8FmLykG0o5U9FMWb+ysrBu/JGEIshMK0JcDx5LUuzcHrjlfRVzGKc3AE4hQJVG2ZCKhermuiWvNt4NJG6InWzIwHCjQOGYYo2u8GeCYZUsm+K6hxEprOVqfoS+tq833IcLIWqBAf7CaM1PeEdeW/6giCdVzs34nu1SbQJnWREssXimqyxSkRNEgdivm6pLq2Xd4YCWjt/KdQMjtG40YYj05UDnVm/AOpvZUh65qkhN1ssmBOHk4bnV2Dki7sHqARzmztodB/cRj2RX7KgpS2/dWqdz6AZ2hqEiQsxeFsIe2KjCoeKql24v8zN0V9agdNk7+HNhmTkz/BYc9IhvFjNh66bJYdm20o9VMWg57cfnhxGW9x0anHZ2zpZEwJO4IczWI+m2s4hRW85vhiV+s6sxXjMib8k4EIE2t5js2SCWavVK5wCSCbBTcTOdyEG/PoLz0hLp6/GJIk3kJ1zj9v5RAaSSvLQGqQqmMUK/Yez2MmZxzUM/ejwNdsOew2Fdc/UElURqQTwDzWDCl7KRJdM= X-MS-TrafficTypeDiagnostic: AS8PR03MB7045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yXwhGAroJqkJvIlfU9EIfJGuSjp6X/tb3/z+F6dzVMADUjmy4tXJczFzL/NE4ioSl2g0ZC/3xOgLQWHnr9JfblXToaA7tOX60GyLR9ZFnJT0h2ceItJLt5TmWY+XZfSLflGtXxVpGqsOx2X+ZuBscesYLcKSWDexqQZ/EY+HgOaIe5ayJoLZOWetnH9hZy+2KYmnpLVFIijuqJymGXy6pLGxrmhkzlILcieYLo3uvz+O+o3FsI+53PatkIQU+kXYsdfn1PG4It61HyfIk71RXoVsiYdWDFoKN8kpeo96J8+qss0u9SQh0np55bPQ+b7yKVKgdf1ibFvpLOVlvSlGNNCFOZOCcaOYiaI5M9mx0C23vu6FT22jy+kPqc93zIjfoKy/CSO1Lk2FVO7oUn/roWW1Wd/MIbv6QzdQOBJVTfZ9CMPj4eCre3KHsfwG7xe8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: swKqPes9buyDSkiYwMHoH+BzKVLEJa/Ff8p7enR+25RMZoh7LonIavVZynX0ifeL9vWq5+lTEgt8Np7SzEngFeGOJuxHWDRLhKGp+q6KCv+a3N1JnyxUy9DkNNoND5xRd6jA2+GZNzS2cQ8dBRgxxw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63ce341e-33be-459f-6dfd-08d98652b07f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:46:35.9950 (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: AS8PR03MB7045 Subject: [FFmpeg-devel] [PATCH 1/5] avfilter/vf_morpho: Fix leak of output frame on error 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: P933FvCc5jSx Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_morpho.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index 13d58c4194..ac561c017b 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -932,6 +932,7 @@ copy: out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); return ff_filter_frame(outlink, out); fail: + av_frame_free(&out); av_frame_free(&in); return ret; } From patchwork Sun Oct 3 09:48:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3289802iob; Sun, 3 Oct 2021 02:48:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPlHBmUeXOqZiSZjwkWmlBp6jJa3RJnrwQxcfejYfYyNoH8yZFXVqCdyEsLP7QviHQ2d2p X-Received: by 2002:a05:6402:2689:: with SMTP id w9mr9913011edd.188.1633254516733; Sun, 03 Oct 2021 02:48:36 -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 dm15si8767740edb.88.2021.10.03.02.48.36; Sun, 03 Oct 2021 02:48:36 -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=HsakdrIX; 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 E653568A6F9; Sun, 3 Oct 2021 12:48:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F4AC68A607 for ; Sun, 3 Oct 2021 12:48:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kAdUQRJD9+D81gAd7WKFHbYZ0MmpsXv+96w756Kij9gi6GYj4UzH/VLeRSVtuhTsF5jcS9rW6WSB9ZPTHl6VTguh7k+vn0Kgy98uRaK1gZyb6OB1b6XGTB2GiUAYq7ebrgndhrWePAD0Sntt2ev3IfIpNmLgg37EnvBgUYKXZr9JSBQwmZiFN6bm3mB5wLwEpguMnJYBIyp357LB+jJzIlxD6JnN7f3ttFHAKDNpzBYxef2fPPtqdJAJgIzA9jWgAOlmA+aLyRZDiDtpYU+qoLinsuzEKyWcUsAFbSAhaSK0euKB+NKp4op7DD2gcOyTByIl08WbwyajNOxEncd1WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8nUwFm3yjvrpjtdRT/JAu4ixwnRGciQk22gfID/E7JU=; b=jCD+4GhrNhqnKiB8zOV/wSO/MyGQrJF0txqe5hdCwSUvi8GrWr3EOWydyueFQWHgaq5jUmMjQtazdwDuLN4hpSpFgPJyMmrs//ON5avr3L2PiG9yQ6W5LSPWAoQbBrfjpnpTeo3F+cvqAkqQyaURTQMYcY0NS65WxpOwpnCo2dDpF9jqoMe93EpAisCZ58KNtHaxT276klJH5xE3zFmvQK5Xs1EMXnwp+NJSf2M3Upo59FMnD+KcHHH6n3LUD2+YE9bPN7OdMZNa7A+z0p2LnrBrbZ9wr1jkbidnhsQ8J4GFckyistnUgAjuSDYzPYvLrok2k6txOAfH9yEIL/8mYA== 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=8nUwFm3yjvrpjtdRT/JAu4ixwnRGciQk22gfID/E7JU=; b=HsakdrIXX95sRw4ukTSUk0tHM1A3VASa3W/PwZ9E26QfZenWsmiclw9ASNtvzPT03E1ZJMpHARptxmQMpTFicnnKchXP91lkpEorJbCk/Q+o/sgn7i89uWQ6F2veaMUULQbQhUW/6Vrt616A5/QKSSPKFJ3oI3P292VnqfotN6G4yWwbPDBqF0nh9J5kWYcw2zuQ9zHAerof3TWMQCxCeQ8UvtXl8peDKKFz349BmCoWuCHpgSqRDDodTesJhtkW3azbkIi1RVG0e164zHcBOIDpm3WsUpN36zaNTAwC/zHVhx72Tdiy17mq+yOvDCNfvPN+Zht7XAuV2YbyXEWJkA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Sun, 3 Oct 2021 09:48:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:48:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:48:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NHnZ+EKTRy6os0UEqtu4iI1i3hAvaxzc] X-ClientProxiedBy: AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094818.3416770-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:48:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaa5ea87-6bb5-4276-97c0-08d98652f1da X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3XUFL4L6DKxdjpUfKPS+CcfOLBH2R5ke8r90KXIdsXxi0RFLyICPrthoxuuUrvOEimIVVNZWO9mdeS9S0RdT9IhO9Z6lK/qVlIFAeZOcqNHJN2bVW3XBCrRkvtnr6jvIxKhC8WaqeCfIWeKVbRxUkVKvz63jl1QM6fCx1dh+5PSjwTY35zqBdQGI1l9dm4Hh3Qw+/BaEmagGWin878B5HKZAlZFCR/gIhCJ13J1oZO1q0jP3sbowMPO2Kwq8bPjvMzB/Y3gEdCSji82EgRRMC+TNkf3wTkSzEh6HxBP4aCpmmOOjG0+UrBqR3GShFfVKCY4p6QdQUwVcG3Qnz1O3G5FrIj6gBnc/F6pb+L6mbqheF6XRyBmomdUkmZ40V4ZOBJQZ9CipKIigXlhglZB1jnGmXmtH3a4oGmwy7xjSgHYxO6J4QkGifr9EzsUjae+89e7M/WhMKSDeTNEjCjDuRBqaOvBKkeYTrG446iJvRKcHS1qdwxQavmS7GRO1SsedEh1fmmHGhQJeBtRu0Dsnd3je3SpvlN9SxuEKgKPLYZWFTxYWcs2WfeUciebVXE5aHMM+W9n4PGGr9JsnhyeGthfV4aAnyNoOwWnmSOb2QBXYgGZkTPu7XHtfzPIYgjcd6Q+v29NUhq1tHceyzgv0mCLfcQ5MayEz7wd90QsQEh8dhneW29qCYwpof85EK3jevRLXNS1U3mmXN2oXQh6vV0b2dKjDbzAodA= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EAwWS+EJZvzLJhGxjhbZCYeP7mSregH/8zZltFILy1hE/jp4F4R/g19oCMDlJLclwpJAUrE/vK7gFCVJ5AQvleY3i3wEn8bjZOfLW2+x4vY/otX6V2ouzQFrLl5Y84SSjI9bE8xH2VNZDLq7x04NB2DFfmZjy3qBJbeoAbfKowbTiF10kK7OGbsaYs3ig8I2F6SdXUkFTZqpuq/WK75BfbYgV1kT2SsJD3pR+TGbancFC3TPuUj/Rn6uWSSNp5kDe7ukVSUJXvLXH+3D7Z1viK/UHRsR7aFt7nuFRdVZTLuvPn/x5o0lDvABFSFLaOgEDwq13zkKRlnpWFR5AGUZjE0+y5d/F3Y8yjeBvHTZdivbOpyX7Rd2vCGLQKlcoisi6pcyhdv7YwSuxA431cQEBc5iaaZ8nN7hULwlHavbCn8+Ax7Sw4ygmz3YRtECALUK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SBQZGc8kEx3H9j58fZemuJNLiG9Jc7UXqQDFQ5xbAnhQHZacfsf+bwYJynSU+5yMgw5lPRahqZSbXEoD/DXKa5OIfmNSWrEriUH4rb1IZ61aFcHEWSp0PC5D8CuwY6MYmXBrM8ALT/+caacjN9rWwA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa5ea87-6bb5-4276-97c0-08d98652f1da X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:48:25.5050 (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: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/vf_morpho: Factor out (re)allocating lut 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: 3yhU+PNmrqjK Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_morpho.c | 60 +++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index ac561c017b..d5c4801006 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -315,6 +315,28 @@ static void free_lut(LUT *table) av_freep(&rp); } +static int alloc_lut_if_necessary(LUT *Ty, IPlane *f, chord_set *SE, + int y, int num, enum MorphModes mode) +{ + if (Ty->I != SE->Lnum || + Ty->X != f->w || + Ty->min_r != SE->minY || + Ty->max_r != SE->maxY + num - 1) { + int ret; + + free_lut(Ty); + + Ty->I = SE->Lnum; + Ty->X = f->w; + Ty->min_r = SE->minY; + Ty->max_r = SE->maxY + num - 1; + ret = alloc_lut(Ty, SE, f->type_size, mode); + if (ret < 0) + return ret; + } + return 0; +} + static void circular_swap(LUT *Ty) { /* @@ -362,22 +384,9 @@ static void update_min_lut(IPlane *f, LUT *Ty, chord_set *SE, int y, int tid, in static int compute_min_lut(LUT *Ty, IPlane *f, chord_set *SE, int y, int num) { - if (Ty->I != SE->Lnum || - Ty->X != f->w || - Ty->min_r != SE->minY || - Ty->max_r != SE->maxY + num - 1) { - int ret; - - free_lut(Ty); - - Ty->I = SE->Lnum; - Ty->X = f->w; - Ty->min_r = SE->minY; - Ty->max_r = SE->maxY + num - 1; - ret = alloc_lut(Ty, SE, f->type_size, ERODE); - if (ret < 0) - return ret; - } + int ret = alloc_lut_if_necessary(Ty, f, SE, y, num, ERODE); + if (ret < 0) + return ret; for (int r = Ty->min_r; r <= Ty->max_r; r++) compute_min_row(f, Ty, SE, r, y); @@ -416,22 +425,9 @@ static void update_max_lut(IPlane *f, LUT *Ty, chord_set *SE, int y, int tid, in static int compute_max_lut(LUT *Ty, IPlane *f, chord_set *SE, int y, int num) { - if (Ty->I != SE->Lnum || - Ty->X != f->w || - Ty->min_r != SE->minY || - Ty->max_r != SE->maxY + num - 1) { - int ret; - - free_lut(Ty); - - Ty->I = SE->Lnum; - Ty->X = f->w; - Ty->min_r = SE->minY; - Ty->max_r = SE->maxY + num - 1; - ret = alloc_lut(Ty, SE, f->type_size, DILATE); - if (ret < 0) - return ret; - } + int ret = alloc_lut_if_necessary(Ty, f, SE, y, num, DILATE); + if (ret < 0) + return ret; for (int r = Ty->min_r; r <= Ty->max_r; r++) compute_max_row(f, Ty, SE, r, y); From patchwork Sun Oct 3 09:48:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3289886iob; Sun, 3 Oct 2021 02:48:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3Ij3I7Iu3RCHl76h2z7S2AIsucxrdneyfaakkE+EQuT7444RmwHMJL0St27Amxb+9SMaG X-Received: by 2002:a17:906:1e16:: with SMTP id g22mr9408526ejj.471.1633254525941; Sun, 03 Oct 2021 02:48: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 p4si18628767edj.100.2021.10.03.02.48.45; Sun, 03 Oct 2021 02:48: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=NF3iTEHR; 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 3F90B68A43D; Sun, 3 Oct 2021 12:48:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 840DE68A71A for ; Sun, 3 Oct 2021 12:48:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qsljnj3D7ZV192o0SIlRIg60Ey9DTwO8WESm5fz59xeVljbGoVg9rc+xAqyUQPNYYBe0yoH743odicVlJDiF4qGAkk75uNhVw/zdNZ7RBcVx+3pDelizRoz0jfKhE4UzIpcuUcSRuB76HPy/xysmJodosEPd+c15WqnK1MQHt21W//OCA1U/EqL65zKZVdace3VZ95DriEhSioB+P9v+GPTQanVcr5Di8qlBMIlVUBNFrsxI1kCtQENHLPI4dUa6J/CaRgn4jmJv4S9H/Ki7Ifb8C/qslQnZ1nMfmETrbvjkAnavM9UAPMEjHW5T3tWRMJcu1Z3FlWR0Qh2UIvj5iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=keK1urwdwzfXRDu4o/yABOaMG1OVqCYB/BuI4fBAQzE=; b=Tvq0JXVMykLWeskj3zq0KMz4L+HpfsDACbDxC4iBHgRcV8ouHtLkWLAYqYN7L+8A/EcnXKosqABSsTxzCsD+/b2cYN4ctW/fcvM8cnklkCoebaqk3H7Wfvh9s3m+HKAJSTZ785OzdLJq1zobxtI9uv521q0EbkKLDMM/M2IYL1ML07A27iAe7zfeaCB4N2oQ6qXx8zijGQ4HNlYF4jyTQk8Nx0j47bfZXF7IALCHN2SG0qe2pGZRnXOihCPApAjbe4sZIz4snfueM5VKarVvE2sa7srndPvj8MFi3T+czGNAaFkNLIxFE7D5Ilt0SeJeiJQgTjt0CDlIbwU01MFwrA== 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=keK1urwdwzfXRDu4o/yABOaMG1OVqCYB/BuI4fBAQzE=; b=NF3iTEHR445DwNghGft3+3kOrpVg4Rb1QbaMSPcTwhyVGjTkCGtNE7DQEdoW+lAUehYTKCLyf9ekemc3S2iMdfWqDBkLm7zDssbXq4D6AWnK0ukWfL1/eaWCZOQpSrA64hwLmIxRt6qny1MXvj0oKQCnqf0bmde020QkT4zlyPbvZhI8ofg/bcvDSIC4gfVBiygzGC/d3fr+QJX790YZQw0DNPnMl0AorYYxM5vukROT+2B/OK5d+gPJoU1kCBlaZ44mQ5S64phed8990fqnYrpym7HEwky0Mm3xd6SXH9x6vASMUEjLBTyUgx4nyXVHbw1UytUgMkhwanEocGRn7g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Sun, 3 Oct 2021 09:48:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:48:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:48:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oCHiOXr9UyQwY5UPe/Jey1yJpAnYUaKU] X-ClientProxiedBy: AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094818.3416770-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:48:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ba1cefc-2028-4387-5471-08d98652f287 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQbzu686YDUKEY6maueAvXAEPnU6EzZs6XooopJsExwQrBAotop5JzWiuTZWm+n70biKrwHor+2F7F2aj3qFKYIvzOj1ZNskOaABq87ScVcdOJlF3gzzzaesV5dFSCGsjgpZo8nMIbuLLjYSqwuNGxvJFiJk9KMPhKYf6t9jG0kYCRLzWxR0We9+W7wM2wbXsGHz/i+YYlYWzX6SZqenqx22cTz1AWvTDXDlaJUcgB8jJB50+CYVJiR7TX9fFJXeQyxHr440xpgmSv94kw0ec5wA2L/gpGZhXXm7Foyar/vfhoUglLl4NxjAgsg3HVJWT7bV+Jocm1+uGNbvKvyBzv3I1rpdjyKrIEC9wD6GsL4IcnoNc9Dgk5/ggsWq7a1NLNEZN3siY5m8+hJYc2lU4zwmeFMCvEK1eU7SjZXRKuO2mwyc++TFwZ215bRJyhNOw+OxL5TBiKoH7Mg6ZSbJPIAR8w1gqXkqMQPy7iWUzxHpxeGE5uj0XeUKjfS4hz0CQe5aASloZdXFNTcNeDBbKGgOhSiRHdnXvDfCgrbQYcekBZE0kjmP7ah1t/5yLMufK5CiHLi/D2Z59lmL2XYHU/kodo/L26+6A+vmR3fzhT9IYSqwd4R+jLCGmIPnPtCoBAEByw1lSe0p9guQXvPMJauZzm1c5h6VE9uXSxVbOeqMeCnz7BVCJDN1EQVDsatZ2x6Cmd0Zle6qiN9884YdovVZSKt9Q/rRlqt0uXugmasTuYF5qrNr4dqlNqaAGMn55E= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2mPdS+K31WMH922FWzAlSb45jIzHazIMtlZlBc2B3slWf9QOtRcxE5FHo4SwuJLY9SEMB0YmutsOdh3UIe3FZfBJmLENEEa2ouPmVOeY9w6p3Lw5uJAFAw6Tt9TcxBE79LiMR/qkg/5m2YO4dLbDXwI6FSyxA/VR8FfU9R+JAzMW3hjXmon80tG3SiWhn64bwRYqutOhjiS0tHjXldE2iS0Dlh2VEDEP45sY3MjKRmzdONDftZJ3bw0vKp2utsAKek/M9s8EtQedYYpGlDP14W0qYaKO36i6kqh+454xahyFTHCvhEyerES/qthK3uCYibiPzLcEuEPupcSl6QNNqf/xMrsCkT/c1idCNfe5hga+FCTftVryWPTL5OVKEH6vYHIJYCzpZ5bL/v7OAUjuoBExT60ubW318l4MWSjoj73Iq4S6898E+wxH1U6BJWzQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RWwonhorkIXOG/d+wUJMA1C+fLCVEMfu8Efa9V52a70+Z61yRFgZNZMqrlcKcDRH4PkZrifR2c0/owjRboh82FIoSQgWuywrQdpFDKIO9jqU4frWivzp/ja8UAhkapPQZeuGLg08OR1yTFK2OP6euw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ba1cefc-2028-4387-5471-08d98652f287 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:48:26.6231 (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: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/vf_morpho: Take pre-padding into account for LUT-reallocation 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: Vc8khzpvcB8k Fixes heap-buffer underflows. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_morpho.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index d5c4801006..8c1e084e7e 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -320,6 +320,7 @@ static int alloc_lut_if_necessary(LUT *Ty, IPlane *f, chord_set *SE, { if (Ty->I != SE->Lnum || Ty->X != f->w || + SE->minX < 0 && -SE->minX > Ty->pre_pad_x || Ty->min_r != SE->minY || Ty->max_r != SE->maxY + num - 1) { int ret; From patchwork Sun Oct 3 09:48:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3289988iob; Sun, 3 Oct 2021 02:48:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzk/PjRxufwAg8RMdJg+4q3mVayxyk775HBE+vu6BSvjJyohgFPmzpicsJazkxlClI/mIUw X-Received: by 2002:a50:d841:: with SMTP id v1mr9754577edj.221.1633254536724; Sun, 03 Oct 2021 02:48:56 -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 i19si7702317edc.236.2021.10.03.02.48.56; Sun, 03 Oct 2021 02:48:56 -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=jl74rW4b; 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 5EE6D68A75A; Sun, 3 Oct 2021 12:48:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B53C368A6CC for ; Sun, 3 Oct 2021 12:48:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i0DYVvo18HnQRXOg5Kta+bwkL7LOxEmsIS0+R8XYWHACVtyRwtKgfx3Bbe5Wxy1yJg2DmFnBUR/mudnAhW871LukGyar/zvyHmn7Mo777bZ3JAJnnCwVm5luz2Fe1yrfk+gfhT6oxv9YWzN0e8Qh51WjK+uY+gD/oUEuvak1avHEjY3TK7aqrM6ZBdXVBmrw45mTWItwnnql5W7YOIW6SeH8KhjecTepTCaXLqbGL/2BS/gq/063jzdSZdeRn3OgRDRykq+2TFKkeazqpy0Dmk/PgMRZwcPD/rVQL4a3U56vms8p774RZT8yrJPLaOnuyyBsAlSfMKV5hRcCsk+VOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kiQjbRLsChE+DF0nf+m78ouRqd8+sie5TscvMLp/iHI=; b=nRRDxXOeJ+mjav/6Od+WOe+MEBo9n1rQHP5+COSYp3n0VHfqtATwZXKxv6GPZYS3emA1iAthHp6bwBTwisPp0oA5MQ8q1HD5jKAwadg0h2vk5oi/s96LwZ+rHhgLZaia3lUtsNlX+ppgw0KhQxBCIJ9EY+D+1cw7/fS9sMII6+XYu85Bl3FKJ70QD9cWQ7zachdvlTjIH8FZz4WGyE/I2Xt/n+xhBOmJb5SHZ/Grox4Yz/PYTFkAvzznDZxiGBQs2qJEJ07HwlQDVWL3B/sIgPm6T2VV/i2PEfRJRex6WC5Kj5ID7yWEq9ATbrXQ4ubmV9wM+zG2km6h3/E2jeoBdg== 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=kiQjbRLsChE+DF0nf+m78ouRqd8+sie5TscvMLp/iHI=; b=jl74rW4b6H9rlgSZdMRB/ymlJYt3Bd+PY9mE+UYYRzeyA8N/wYrnL6nrjf7UmGSkUCPyDbtzTof3H53JEi0fl2PMWNAOEeFzdvSJBHLV+jR7znJt5VJkRdhoyrLvLInlc9a4ZE8h2txZgMmnliTTYVbJw3/Jn4nMp2990csp2kFd6cM72uG6wMII8+RyeABLNmEu2swErp8vO00Y9aisjQBwKLOJfSH0+uSX2aX3Yo9G7QMKGzLajYh4atFZUaA7vuYOLmm+FRHLaeWH7vElOn6pwmdjJZuPaP+SbQgTGFoTkr1q+3/QKOlLay19ucp6rUQR8JWx98qA6+TYphJrIA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Sun, 3 Oct 2021 09:48:27 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:48:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:48:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [8Zw+SYX9T4Gqkd2HjZ/5fUvj5DTjQPuu] X-ClientProxiedBy: AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094818.3416770-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:48:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad7df8f4-61db-423f-4e87-08d98652f333 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQbzu686YDUKEY6maueAvXAJzCk9hM5hETbmpEI0FzLXrB7sUw0Yz7FMy+VZ3chhvd3/NBinrX6ptFo2NViEAEoSac65hlXhEi5MULdJZB3b0CM1y5ocnBF9mDOsw9LHtNvZC2aCUcxnGA5MvC50Fvr6wW6TNpE2ii+K+2NDln57FuPbkefVqBaNawwXRVI2Mz7FqChici/77vcqCFSd05tgSrsSabiiTbxbGxXl4DnqMYsfIWtrsILq0w95WQczBoHpBDmFersq9l8oPbQrrlIMH1S/PhKOkypCpERWipzzOkXst+2p3aCkU1O08HUDqbFct+SrfqSlReFbTUTA3xAdW3tc/1JuSaXtmhxpwT/a1ZSbwxPb+dtR/wW310G+sNtTiYjTV1SUQIbBsm9wQFYZ5KhyKZqkRJAbP7dViCP4hLTzg5YLEA4yUm8R64IKLwK/+oOwOGrhI7nvMlTmDCIz/8QsaTCa4/+gQUaj2Z4ig4+g8ZnSQvYAJELdDBCh5ab8gxQ3WElAgkoY1rJi5Vcn40cLBW3UKeaIAnbcH+LGSc5MruvMEccL6X7y23pj4jMnqIspjC1uWSkuJtIKugZp6ulU+kWDcUjiyuFeLtBTNbcN1D+XG6YLMEE6Z7tra98DqeAou4yczlGYr9GhEfxd3XPcblyXy6HdKOiYJ1kgAKaXaGTggyttKX72JDCvwWOGFOZ4u6c8MnPA0aJyqJFm3eVUjzQiXZOLYjtEml6qkia4xGvqMGsiz+j7u6MFTI= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oAtVv46DP7f0OCEIB/KEFsGX6K0q28CdujXV5gABpdIqxWCao9wjB73ZKixe6oRiD76uzntJmfTdBEIngEmEjNXW8VJUJYkO2obzZsu/SpVzd9uN0kgLk9Uh1F8diyNySwptJj9A7+62oABM0slLNJ5URevngPZW+0eu1edpuEdUKrDSv/O1vDf/MMEFEA//Fao+pvplTPXN1/kYcGVfXEOm2zpEkjNpPUJ0Vrt87GyHDz/TJ+iLtlEqP54ZekMQF+LItPwUSHVi5QtXW0YAJ/P8NrKH0mVoid3s/lln2yLHZ6MLnjJX2yHFJYHEUAFRF/TRzSwEE5e6QAG1U0QWidKqksKoM1OgO1EZogAJ5Um2HfcISjwFGnSbVavlR71k7w4q5Hi86qTOwP1oVBms/qQPhgUeZn6kkadEdRK9qs4mKaeyY7AVosQIish34/wN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BnHIuYNjscDjG1DBSGo9R+YIMIq9gEImVgE8shgsysge6MB25A4QUZwIwGXPkIU7p0RWM6bVgctiX2wOWZV0UKqIFL+hisYUGm+trUjvWRa7iaaLuncqQVXCvhpFqT304KLp9Q227hSPfN87D0liEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad7df8f4-61db-423f-4e87-08d98652f333 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:48:27.7522 (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: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH 4/5] avfilter/vf_morpho: Fix invalid frees on error 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: vTDxlM4NFYxZ The current code used a pointer to an array (of arrays) that is offset relative to the start of the actually allocated buffer. Yet offsetting the pointer is only done on success, whereas the freeing code believes it to have happened even on error. So if any of the subarrays (or the subarrays' subarrays) can't be successfully allocated, one gets a bad free in free_lut(). Furthermore, said offsetting is only permissible in case the offsetted pointer points in the allocated buffer (here: in case the LUT's min_r is <= 0), as pointer arithmetic is undefined in case it exceeds the allocated object. Moreover, in case one of the subarrays couldn't be allocated, the code nevertheless tried to free the subarray's subarrays; and in case one of the subarray's subarrays could not be allocated successfully, there will be an invalid free, too, because the pointers for the subarrays' subarrays are also offset compared to the base pointer. This commit fixes all of this, by using the actually allocated pointer for freeing and by adding appropriate checks before freeing the subarrays. The former also allows to distinguish the cases in which the lut is currently only half-allocated due to an error in an earlier allocation attempt from the success case. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_morpho.c | 49 +++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index 8c1e084e7e..818ebd6b9a 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -61,7 +61,10 @@ typedef struct IPlane { } IPlane; typedef struct LUT { + /* arr is shifted from base_arr by FFMAX(min_r, 0). + * arr != NULL means "lut completely allocated" */ uint8_t ***arr; + uint8_t ***base_arr; int min_r; int max_r; int I; @@ -262,7 +265,8 @@ static void maxinplace16_fun(uint8_t *aa, const uint8_t *bb, int x) static int alloc_lut(LUT *Ty, chord_set *SE, int type_size, int mode) { - const int size = Ty->max_r + 1 - Ty->min_r; + const int min = FFMAX(Ty->min_r, 0); + const int max = min + (Ty->max_r - Ty->min_r); int pre_pad_x = 0; if (SE->minX < 0) @@ -270,55 +274,58 @@ static int alloc_lut(LUT *Ty, chord_set *SE, int type_size, int mode) Ty->pre_pad_x = pre_pad_x; Ty->type_size = type_size; - Ty->arr = av_calloc(size, sizeof(*Ty->arr)); - if (!Ty->arr) + Ty->base_arr = av_calloc(max + 1, sizeof(*Ty->base_arr)); + if (!Ty->base_arr) return AVERROR(ENOMEM); - for (int r = 0; r < Ty->max_r - Ty->min_r + 1; r++) { - Ty->arr[r] = av_calloc(Ty->I, sizeof(uint8_t *)); - if (!Ty->arr[r]) + for (int r = min; r <= max; r++) { + uint8_t **arr = Ty->base_arr[r] = av_calloc(Ty->I, sizeof(uint8_t *)); + if (!Ty->base_arr[r]) return AVERROR(ENOMEM); for (int i = 0; i < Ty->I; i++) { - Ty->arr[r][i] = av_calloc(Ty->X + pre_pad_x, type_size); - if (!Ty->arr[r][i]) + arr[i] = av_calloc(Ty->X + pre_pad_x, type_size); + if (!arr[i]) return AVERROR(ENOMEM); if (mode == ERODE) - memset(Ty->arr[r][i], UINT8_MAX, pre_pad_x * type_size); + memset(arr[i], UINT8_MAX, pre_pad_x * type_size); /* Shifting the X index such that negative indices correspond to * the pre-padding. */ - Ty->arr[r][i] = &(Ty->arr[r][i][pre_pad_x * type_size]); + arr[i] = &(arr[i][pre_pad_x * type_size]); } } - Ty->arr = &(Ty->arr[0 - Ty->min_r]); + Ty->arr = &(Ty->base_arr[min - Ty->min_r]); return 0; } static void free_lut(LUT *table) { - uint8_t ***rp; + const int min = FFMAX(table->min_r, 0); + const int max = min + (table->max_r - table->min_r); - if (!table->arr) + if (!table->base_arr) return; - // The R index was shifted, create a pointer to the original array - rp = &(table->arr[table->min_r]); - - for (int r = table->min_r; r <= table->max_r; r++) { + for (int r = min; r <= max; r++) { + if (!table->base_arr[r]) + break; for (int i = 0; i < table->I; i++) { + if (!table->base_arr[r][i]) + break; // The X index was also shifted, for padding purposes. - av_free(table->arr[r][i] - table->pre_pad_x * table->type_size); + av_free(table->base_arr[r][i] - table->pre_pad_x * table->type_size); } - av_freep(&table->arr[r]); + av_freep(&table->base_arr[r]); } - av_freep(&rp); + av_freep(&table->base_arr); + table->arr = NULL; } static int alloc_lut_if_necessary(LUT *Ty, IPlane *f, chord_set *SE, int y, int num, enum MorphModes mode) { - if (Ty->I != SE->Lnum || + if (!Ty->arr || Ty->I != SE->Lnum || Ty->X != f->w || SE->minX < 0 && -SE->minX > Ty->pre_pad_x || Ty->min_r != SE->minY || From patchwork Sun Oct 3 09:48:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30889 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp3290116iob; Sun, 3 Oct 2021 02:49:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAfJuB0ckEPSn94Jp8P0QlCnSgXh8I5SfzLLuvqbMDaV58cCzv3JD42VsbBsS42X/6DN8v X-Received: by 2002:a17:906:491:: with SMTP id f17mr9439668eja.413.1633254549032; Sun, 03 Oct 2021 02:49: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 13si14683382ejg.193.2021.10.03.02.49.08; Sun, 03 Oct 2021 02:49: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="j/VtsRPu"; 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 AB57C68A774; Sun, 3 Oct 2021 12:48:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF2AB68A6CC for ; Sun, 3 Oct 2021 12:48:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MJ2iImH0Y6xQBaZ103UM7J4mp4Tm4qb/1Yk4ckPAZ4Bm6IkuLcbqpAo7hfGDFLubo3n/Q9H7IqHwEoHO5TFI0ONUswzH9mlcl4Y46cq2S3htJjzz1JkOf1gglZBZA3l1zFQ9Yfgv76vFUHetFrg8IT/3SaT6Y+yQdPGbdfbWKGF5HLceeuDzWXhTIhShUsJfOcEsBsT1IvKY4MYqZ8IXjT4iuyLA0Hh789Od7ePYaSPeR/m1tOcL4m8ksp6eWmxq7P5mD6Y30QLGE6CEWTI8mJe5lqYNuZRgw5/W8AmJD1lxpZarVpv0hTnGggWYkjf/bCTzpQKIsifRzA1RVY2Skw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bx6vZ/8cIAEwwNa2y+Soqn41Qydyz+sGv1VO5573hTQ=; b=dM9pkWyClo9KmgvYbMlatO6k/c0Ee0tMKZYinh29oDoDZHKcOHQOnegE5nERvZFo60E20RHCPBBeXaoclEzk57y1MNjO3wNyWJYBoHHD2IPn+Kx1wXocIJO4VTffSBHMA5RH4AXsWfFnEb9E3wDKJ7nmi8ViPFhitsftR/OilXfsaLprTSjS65R3tbLUQHCrUkbdHHslHfEHuhSkO5JAbBR8HCq6iHI/FSi4hNaZ9+niCwwo/HeAZspAKr52RnrZFYqPZqmAaUBKArw2vMNhhZzoWg6epVW1/jNAcvaZ2KNkzkYn9pZFi3myWyqt8ZS31WjLgRwOMEiB2S6+X0NQyQ== 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=bx6vZ/8cIAEwwNa2y+Soqn41Qydyz+sGv1VO5573hTQ=; b=j/VtsRPuDuJy/bWjCXpHA3K0zI5+9yb+1sHI4FZ+BY+VdV749UXvteUn+UfUQMZHyO977ydNDPf07Vg7Oh7JhI/jcTLqj26C7G5bMa6fY6CGcZCZTjEBmbNG+hTvRvZJRlAqEEaihb78NjlEflQWmTEawlyEyE76sDM+6Z2CkS0i9b/lYOaqeBtnEOsrVtXhCQWtfNvk85dwFhYK2d10ym9Me3IyanamT8Js1f9CZ4ko0MepGFuBwMfLzrEcSb/cUTdGsqrmiOrpTgmWlVoLjOtFC0n1eVdcpvIz9yQCeHlzJ75Qf0HxRVecokHxqBbJt+nrL8TDX1NQJSCbQ9wPCw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Sun, 3 Oct 2021 09:48:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.019; Sun, 3 Oct 2021 09:48:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Oct 2021 11:48:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [F9BhaBGi0XtS43ZEK2F+MbSxpfP0rKUU] X-ClientProxiedBy: AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211003094818.3416770-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR05CA0114.eurprd05.prod.outlook.com (2603:10a6:207:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Sun, 3 Oct 2021 09:48:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: faa307a8-7598-4ab6-a0cf-08d98652f39f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVEDvceMUntCVvbDIPTe0ckSpUyveR1eUyrJeXYW2r5bXWkvWScaruJgOgLP/oaJ3A7wC/D+SicD3RObhI3cDZuDnRWgf7zM2fps8cQpHX47OX9DlZNFe0UEPFn1wwQpbzrbEd2LfhXV7SVjEjKbMjNPTeifNSZiKIfDTbO271lk3jdZAQUbS43trWLy7wjmNegedoawSuD5iL0KbRacvOVI5PI9AiRxLozqP4IJKYdeYQ9u+v5X8C/4LebL0dHsHValBT8vAAot8x80Qd0Qz3ltq4xcSAEDBk7EjTPuSQWMljmOEujJDQgL85wUt4wmBT4uijsFPOaSxiJQeodo6KHPOI0cS/tCTrYOg/2v/RnZQNdIxl7VLGjipuEAMkfGf47n0+YaKX/oeo92DWW1V4tV2FxiNC9VXCeQdD56NsuEd4USWC2j1D3w2YRayGe4+BSRUZqnXuOmuUUuINKrXJDXipLGCXsq3d3stvUJg5eYzxV3Ibcxra3/3atJffGSVcBj0EyoW3+rQ+D4DGMXXdaagi/S5lOZImz4AitEg983CiGj/gzkz3YAxgQG53268OahlHUYZvMJ8gu9Ogqo6htV2YbJJKk4iDk7MYmVb+jHl1hFLqfsdGJT/uqDUNyv0Pcls62eTZ+i8X4Q9XEvsmoouK0yODd+W53wvozyOgWvIGYFstgRXpnK+pBV89IJF8T8HNgsw/7f7qB3SL0xBaynd9xMNmBoZY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C5cOz4+M7gh7OQfjSTTLPDKUKC4B1T//P7PDB8tYrztV2xGSBZlntjn761MP4w5uySmVzKOE9ibubv/hbmByuXWXOcrCIquQE5ClsvLiIc6X8Nq60GQ5uXTEtpegnCxkM+hGdC7/heDGL27gx68r2PEWnvQnBr2FvZkJKENj5shJvLmP0WNKx7o9NuVOgcd2PBYS9wyiU+k3TGmdWucakhLH0wR7sDD7L479qoyycBZ1NsgNZNcTaPSa7/X6p7TlomT4JYvDBNnEkXvhIF4Q+y/jF11JPB358csX1xkj3HIXRiW12hrN6F/bZQ/XcRu9TtGoNrXIur7q7wDtmefxty81C8v62Qp2f26jaJb1w/GABBGSKmbBa6HxJHSKOB/gHQDVY9NGLb5uoCiyUh+gxSwC/PuBMzfXkvG8gZLJdX+Htw0f8x03kEXpVWGe7ld2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: twHwuP+iXAMzc2+gITDFVD88i/c5ZnopQ4xzLJnTszVA6YT3Fgi08Hy3WyrHnoRcZnRpm+m3KnX+wItPv3CyRYhdfGLV6eYAAYlxN0A4a/J5aSabPcSpaObTTVJTH+tjS8dEwUsXBP3+jaEj1J8uZA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: faa307a8-7598-4ab6-a0cf-08d98652f39f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2021 09:48:28.4402 (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: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH 5/5] avfilter/af_(afftdn|agate), vf_(guided|morpho): Remove timeline support 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: jO1M0sAd14/O These filters trigger an av_assert1() in ff_filter_activate(). Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afftdn.c | 3 +-- libavfilter/af_agate.c | 1 - libavfilter/vf_guided.c | 3 +-- libavfilter/vf_morpho.c | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_afftdn.c b/libavfilter/af_afftdn.c index 5e9cefcfc1..87c6cd2219 100644 --- a/libavfilter/af_afftdn.c +++ b/libavfilter/af_afftdn.c @@ -1419,6 +1419,5 @@ const AVFilter ff_af_afftdn = { FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), .process_command = process_command, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | - AVFILTER_FLAG_SLICE_THREADS, + .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 5de2cc0f0e..63b4d8e7b5 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -407,6 +407,5 @@ const AVFilter ff_af_sidechaingate = { FILTER_INPUTS(sidechaingate_inputs), FILTER_OUTPUTS(sidechaingate_outputs), .process_command = ff_filter_process_command, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_SIDECHAINGATE_FILTER */ diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index 6720213219..16a6e9043c 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -494,7 +494,6 @@ const AVFilter ff_vf_guided = { .activate = activate, .inputs = NULL, FILTER_OUTPUTS(guided_outputs), - .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | - AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index 818ebd6b9a..d29961f5b7 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -1027,6 +1027,5 @@ const AVFilter ff_vf_morpho = { .query_formats = query_formats, FILTER_INPUTS(morpho_inputs), FILTER_OUTPUTS(morpho_outputs), - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, };