From patchwork Fri Oct 8 07:59:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp614061ioa; Fri, 8 Oct 2021 00:59:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf41hSjc5VqBdgfWVHMsfBNjHH/sTo8qtK6nVjoc/QyT0pIJ+QRZe+V/JYwdIw8bfTXYNq X-Received: by 2002:a50:bf4a:: with SMTP id g10mr13368344edk.11.1633679976842; Fri, 08 Oct 2021 00:59: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 q6si2109928edj.430.2021.10.08.00.59.34; Fri, 08 Oct 2021 00:59: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=L4pJeRiZ; 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 E79C968A5FC; Fri, 8 Oct 2021 10:59:31 +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-oln040092073081.outbound.protection.outlook.com [40.92.73.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 571CC68A35C for ; Fri, 8 Oct 2021 10:59:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nqYcIcgUS3WtT3lqGxxXM6FkgOmAR6TBw5SAf+TEmdml6Op/+FhEgQHcxZY+JCwl1nPay+X7IH+3miMYgZZ0XlbVSmqYBgXW8LtzLHReaNvO8NoKLfoQ3cb/799iibNL9RoMm8fjI+i8G3ZENVNi5ByoQ7nlzpI5YWah54A8rcuAgWnGFCaC81qxzBt9yp9dmyTS8lpxq/xNBifZRLd5YCkOE2k3G0m/HrrCNexHtA2XMT+tjHs/S72mqxm0O6PyuoW9pNv7r48Xz6DTPFGOUOgacBTIyg3OQ/6y/DPUN7hT5SjqmHO52cDpq60JUE+/zesFWDfPnI0jkj8ExsFltA== 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=x6QkSvTCgCIhtyI3xb139It9bmC7NHfPWOBIY20RdgY=; b=Ct4LdfONJ16zKjdTjADhKi7CiCjyCYf7IQ/ElvgtcLnhRoapg4I5PSYIzjJM0RB25VpmNpsGR9u1Z3BsTfLphjGRKxrwgZlwcXwQFbGEX+Ujugm2vRoWXPQnnLqNaKJgwkU2zxadN6XuQqLb52aeQLp9xdivx2Kq73QW+Uo74t+q8b88lPl8UzM4gH1i9IdBHnflyJbqqyBGNKT6j1L0N/ukNEk5LwyKY/ITJdhOKrw0TGRTBsVOv+Sx9XKYZIxBN78x/JpkTiTymsKNK89RKkIheENPgsv6/UxoxvUMQ8S5pORWvnNRekrMi6c/vCdcAkp8lnabC7KIP1dp4MMslQ== 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=x6QkSvTCgCIhtyI3xb139It9bmC7NHfPWOBIY20RdgY=; b=L4pJeRiZTGtSNQwyJTASwLx50g1SBqIlCRXqjoCWRcTG/7dWDkjyCarI9EnuAUGxi/M1pkqRSLxOUqS+4B+it+4rS9hxPvQK7BUzuqBloSdiT7QNTdeR/aBxMOu9Heh350+0VRdycP+ZBjovP9MeTbf5J/C3cS/RzauTED/ZAYuc2mI6xHDL1ZfsEg04XlQYEXIBX1l983mLELLVIznQQPdi0ca0c/fwZnvk4B8wRpfuCmeUEGiDwiBqpkWfh78XHyHKvuJEi+UOPpkOY8V1NQttKdYmMyyJJh3Ap56ZU16zQO/h5JjjPiYJppfXxdx4paZRhb2p6nyRwE0teYiCdg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2356.eurprd03.prod.outlook.com (2603:10a6:203:6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Fri, 8 Oct 2021 07:59:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Fri, 8 Oct 2021 07:59:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 09:59:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [0zpBJpfc0e/rxO4CPly2bsYCGVCGa2/E] X-ClientProxiedBy: AM3PR05CA0086.eurprd05.prod.outlook.com (2603:10a6:207:1::12) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211008075914.1140150-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM3PR05CA0086.eurprd05.prod.outlook.com (2603:10a6:207:1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Fri, 8 Oct 2021 07:59:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f50e79fd-eaa8-49df-9508-08d98a318aee X-MS-Exchange-SLBlob-MailProps: H+eYzHeSLUsN3zbmk9isWJtNwfwfPvHl0maban2UMBOIBiKkDHzxZkzfv1lbPltY8XtMdQ51SDr5v4snVCVqPSSwg4y4Yo1pK+CDAPMkcKuXVUlV81qmqfsftYxdBQv2QbbbPY8lQZGajCw4aFrglSRFp+dwA4Wal7/lF8vq8TfNLNvsk7okz8LUyFcG/UL2HpTTGqCxnY5pW5a5qEyS7pIx+f3yDh4X3lTGee6D+zSlnCN0L8T86SDkxG9W6HxgBf9dTxwmji8gynZLdD4lv/QObNc7+GhPxhSSYyG3sQ14Y9pTwnJ2/hVwAyfYFKEpggX9T1jn6YpCf/EuYApo3qP+M9QkeBvNqmWWo1QjLFPBgrRBX5tUhABLkQZo1UYeCMqa79dsDUfCBPyGJZ5BZjJVW8EhducGBur0f/Vxlvi/vtJZhawVoHW+xC2gX4nQHDliV3xlIFtd3edMgiIO7qCroYopTylAeotrHYEaF5khYGNKOieAYUpY5UGedaVoDXnJ+N6loloOXaRWjL002jtEB83CmQ+KYIljBB8lqGzTd727k/tg0ofbOqPKCVyfw4dMiRlDFq+f7+kqyp/ya40WNjZxrrgAyUQxgtYYsiX0PmlJfa88sM9bp8eIVuFxexvXSmapSHxLe3m84KzXdWgJEmAkdt7j3jQwtTX1PsEydg2qGf7Lrf4HACMVz+lbgYVJqndVCUxFF/ES5woZmgxMybeeOhW7t0FYThnZ420bX2hfDlTFJA== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2356: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ntv8bgSScNNhw1J3TUvok4Mc7kY26UdAHzfhWPGIIG5UWfICgVM+R0pA/gDoRtKCFxbbmKegNyno5QTfv0v4OI2l0YLg41AyUknJJQzVpJGUsqWaDsEq2dDHFBOhoUQ+Ao8F2YO7C5oKK5cEllBHghkDipI+8yIFbsOUKk9yK28KrQKx27H3IVpwfvoMsL6sTkbPZBM/VUFSRSm65B4MQNwdzGndHpkaOioxpgh19uYAUk9QGNGLVilE/ldXn+C7n9+vLmjwLqGAlJXFBt6uLyHiC2dAk7aHDfasfUT9MacJwXH6rwgZWP2JrGQE6xZp+IxyvI1pChCZTmW7pqTgCeRHCcMDfNm+pn831h5IODHr1r4mwoI4DzHjKJ98lR35PurmVpghn6y9tvBguk4W8jvf2jM/BHMR55+rZNDq7zB6/ancW7NDa7tYcTIQHXtb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gnHFDF5ZcARK/J1GzDSG78rMUW7gnq8tU4vD5ypJTbq6lHL5/Y2yG5Xq32ib/ne6a92T43dUy94zHEZ+qFp/HB6ajYXDonMsj9O+o1dWV7OkAH3Ax7iElf7ZHa3IxQ1z8L+LCEGHjoM+0eWI0kgTJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f50e79fd-eaa8-49df-9508-08d98a318aee X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 07:59:24.1992 (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: AM5PR0301MB2356 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/avfiltergraph: Fix use-after-free when inserting auto-converter 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: Paul B Mahol , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2zC9g6PvgIdH When inserting an auto-resampler, it may be that the configuration of the filters that the auto-resampler is supposed to connect is already partially merged, i.e. converter->inputs[0].incfg.foo and converter->outputs[0].outcfg.foo (where foo is one of formats, samplerates, channel_layouts) can coincide. Therefore merging the converter filter's input link might modify the outcfg of the converter' outlink. Yet the current code in avfiltergraph.c used pointers from before merging the inlink for merging the outlink, leading to a use-after-free in command lines like: $ ffmpeg -f lavfi -i anullsrc=cl=stereo -lavfi channelsplit,axcorrelate -f null - Fix this by not using outdated values when merging the outlink. This is a regression since 85a6404d7e6c759ddf71d6374812d7ff719728ec. Found-by: Paul B Mahol Signed-off-by: Andreas Rheinhardt --- libavfilter/avfiltergraph.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index e536abef8e..0e3de3cd56 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -520,14 +520,13 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) av_assert0(outlink-> incfg.channel_layouts->refcount > 0); av_assert0(outlink->outcfg.channel_layouts->refcount > 0); } +#define MERGE(merger, link) \ + ((merger)->merge(FF_FIELD_AT(void *, (merger)->offset, link->incfg), \ + FF_FIELD_AT(void *, (merger)->offset, link->outcfg))) for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; - void *ia = FF_FIELD_AT(void *, m->offset, inlink->incfg); - void *ib = FF_FIELD_AT(void *, m->offset, inlink->outcfg); - void *oa = FF_FIELD_AT(void *, m->offset, outlink->incfg); - void *ob = FF_FIELD_AT(void *, m->offset, outlink->outcfg); - if ((ret = m->merge(ia, ib)) <= 0 || - (ret = m->merge(oa, ob)) <= 0) { + if ((ret = MERGE(m, inlink)) <= 0 || + (ret = MERGE(m, outlink)) <= 0) { if (ret < 0) return ret; av_log(log_ctx, AV_LOG_ERROR, From patchwork Fri Oct 8 08:14: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: 30998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp625133ioa; Fri, 8 Oct 2021 01:15:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtbQAunK5srUxX4lTY50ddMHfGjmTdkBlmi+m7a4hwaqlqOcSM3NVJHOaCd23kHeZQ44FS X-Received: by 2002:a17:907:f83:: with SMTP id kb3mr2502978ejc.453.1633680902829; Fri, 08 Oct 2021 01:15: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 l10si2002960edq.241.2021.10.08.01.15.01; Fri, 08 Oct 2021 01:15: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=E3b9sqEG; 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 2CFDE68804D; Fri, 8 Oct 2021 11:14:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065060.outbound.protection.outlook.com [40.92.65.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CF4B68091D for ; Fri, 8 Oct 2021 11:14:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kvnpjcCIZZLvEOEwandA91DKkCr5MsqLG3KDA94u7JSdLHTra6eFQeOU7Fl4F8M2eUBnVbku2cPNEaL4NF1vFZOhz+Mad8YqgaNPN84NI6eGgagAzl21yVIS4uEdb8oiyFraPMM5XRjgbGP2M58YGtE6fwpXPDLtfVFwI5xffN/eLB0HOyQ4ndh/Scc5By42wFEID16xsaja7+aO+zl5OjHPtMKKeq3uSB66VOY0jBNnXJClIva3Aiai5a+EGEb9UUmGkTecqL7zW3UnDui+54M7gDfLScOnca5W0keewYIp28BcLey5dc70Znw+WyNRG7FTlhkXNg9lP8CTsN1P3g== 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=dF/yUOsZU5NhK8RY8rESP4sFMXjtUjbpaM7nVvw6NqQ=; b=nIcZBYbWGduVaWfir3WOyVxywTTz+BmNnxGiWkyfPE41trdLqmH2g2ZWNn8sytLzSKOuAeTk4L2OlM8wcQXhjssSsnjLFtgUrV6bmzswolg//gysSqnio3rdf8pkCrOANmYONpciHlIR6Ts3fV2B0uzxUdxFOrVslqiaoDawgIdqO1ro9GCULbOXNcU5A5398DWfPZunSVCUNTyQuWYoy62TchnsbQMz/X39/twekf7PxWsu39U4kgkilNehqh11oG2CiO4bQwdLkumH9Rh4OAEP+js/raqGRi1N2Nwj+eXe58hvkO/ejeWSsQmTBlzUrzSHbfyZl+cu+k1xAYvcZw== 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=dF/yUOsZU5NhK8RY8rESP4sFMXjtUjbpaM7nVvw6NqQ=; b=E3b9sqEGXxHEoHg2gl1JSBSz6KmQcZCnjmNSqBGbDrUq7On722SSIQp9uD+iyrSGdxqHAyLiQjHinLLay30BoPACw9KprlA+wuJTrB+jb7VUg8b5k1+ZzoL6PD6GX50fkClJYIh/AFdqar/sF0e2QVemwNX0JOhX1gVji2XIMG18NvElQvQ4/IrB0tTes9utBXHSI2UHcJ2AIFHCoU0pBjSgimNA1YFNeSrOZdLThto8gZATbLEuPSBMy78i3lY3+LwAxN5X9T9nerGN0nFGjX3dB8vnKW9jJ1DQWe3sfsnWuNqP/mQTgxQHJ4rnq24STOMQLWXCQc2lkAdvBPjP9Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4951.eurprd03.prod.outlook.com (2603:10a6:20b:82::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Fri, 8 Oct 2021 08:14:49 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Fri, 8 Oct 2021 08:14:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:14:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [P2MQnWqXYtm4TOHqZaLhR5ruo8CNzkE0] X-ClientProxiedBy: AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211008081440.1156233-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.4 via Frontend Transport; Fri, 8 Oct 2021 08:14:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91c70489-a794-4791-48e9-08d98a33b27f X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UXq70ozwkY25vQtL830JLO/unR4DrCADVJQEEyUzD6bjmhDqPfUwATF6xcNM442MzAv4ljgbuFkvsdyZWCXeioq9+mVoJEgMg6LbVMlMpVW/7FYIywK/+Wr4jjrNoWkZkMkQMK5sdXsH6hDrg/xuEcJdA8uAwFpFlBUtuyN7J8Qk/msh48c+WTrCNs0ZHo6nycuKb181n7soryJaokPFN0dYz8tMG+2fiWIXDV6ZS7WmsHpo6ztb/tpbEiLwH6KeallGP883/j4ElxECDzDYQkkbK+hh9gvol67fyuVRAx3wGDpATo3uOWlv3jBSodmPBl+ICtizegL+5yCddgwXDP8OWiJxFhOA+gCgaT5BOVzY3KBz/qSDCTMYEQXUlrgLipmnlQovd7ncY9lwZJWxe3mVx0XRzmGB0Kq1qtPoPCITtER01QdxH9UKopuj3+WR1DrgAnYUzCox1bGjOCmv4LqRyMzZEo2xM+4Fhp6Jr1olo+x8nqWlN1CMGZgR3TqZAUizeVIcb08eNtGv76H1zKFcM837Jfj/sKukujPZvwrWxIA2+7eMVYZju8bAbi6VHn9/jJ9y4KJC4pQPmO/5G6p45OCdu0YXhNFqmOVwA6vWqnlhkiwC+BjLJ0O6HE4A8+Bat1Ip8BV2kZ31HAmuAjah52RwsLy1feuVsQYYULeLb6asoe+npOGdS+O/10HY8hY6wryOPHm/XWtWi4kCk6Ku1ooKZGEcI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4951: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ec6Bq9l+pjuWZ1FrKt3n7D+Mvdf8UCQQeGtZGdffKGhc1w0Y1ZDlg7v3zxlHnFa+8KtjvU4vBmSwme90KEvqsIyi240vDLOfvAFd1m3gT7DxpxsTmf3Ch35MG2QQ6ygx3vuaRbbMCaC/pNJO5XeZ2OnHGWeyuCTc86mgViadyPNcq+SNaLvjJJNxkAFX7BXz6Uk2arsdgsWJT9wJjFx6dcafspKGg/HA8zErUzFiKrGhIaStyMcAmDJqKRQTji7xIHvXtHsAj2mrpkOm3F0ZnREVtO0IRA+aOOw5b48wy51EQzzJnPDa5HJ76Fg3f0yNkcbtEhXhoSNFBsl7N5SbkYMsIEwz8MLVdVAoJNLSyTWOR+REpgFRhli8m9OSCQBqPhIzYcutip2U4gyl7rgOJpa094jfdjIlbcIgi3sZmBNZUIpNIKRRk1oON46o6LsL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vt/9gTTbZteZLtpQ+pUSlzvi9TGVHXSvBUUpUhY8wS7TZdvMo7mQglhpNk3RZUKkP+m8t/zfIh3qH0Z33BeEQQr2cq/0VA0KoAlMXEZggM1OYxleHdC4BkfAf91/GoTyGTbMbW1zhJRZHKUkYr8T9A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91c70489-a794-4791-48e9-08d98a33b27f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 08:14:49.7763 (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: AM6PR03MB4951 Subject: [FFmpeg-devel] [PATCH 2/4] tests/fate-run: Use DEC_OPTS for additional input, too 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: yaYZmBfn5JKD Should fix failures in the cover-art-flac-remux test. Signed-off-by: Andreas Rheinhardt --- Sorry for this; will apply this soon. tests/fate-run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 87b5539296..fbfc0a925d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -232,12 +232,13 @@ transcode(){ enc_opt=$4 final_decode=$5 ffprobe_opts=$7 - additional_inputs=$8 + additional_input=$8 + test -z "$additional_input" || additional_input="$DEC_OPTS $additional_input" encfile="${outdir}/${test}.${enc_fmt}" test "$6" = -keep || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) - ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_inputs \ + ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_input \ $ENC_OPTS $enc_opt $FLAGS -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) From patchwork Fri Oct 8 08:14: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: 30996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp625239ioa; Fri, 8 Oct 2021 01:15:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+NlXOpvH14vtkKrI+zrHIxkftq8iHJ/n9m0hA9PwOjE7nS0REWU/VdUSeuQOKbTGwhMtY X-Received: by 2002:a17:906:1f49:: with SMTP id d9mr2454571ejk.150.1633680913040; Fri, 08 Oct 2021 01:15: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 m27si1400135ejd.83.2021.10.08.01.15.12; Fri, 08 Oct 2021 01:15: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=mcnVWrYY; 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 65977680923; Fri, 8 Oct 2021 11:15:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065060.outbound.protection.outlook.com [40.92.65.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73D3A680923 for ; Fri, 8 Oct 2021 11:14:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WSaooCZ/CDOilEVqElzrkEn4C8q2gcGocJmnlwr386c3dn9UEYS81voiS5bn7dv87548jhJEHSuON+EeDCWXZ0CxQRyg5JuCiucNDpmdZklWOKFgFP8vaofA094JWi8549xT5ieDzjl5jLdvk/V7U4G23z3ijd/7rgkofd8qyrNberXD7m1muja5EQ9ngwG9eSzv7DpwDZprZ3Lq9dQ0Y9k+L9zO89louJl44DEvMpyCt8/c6bC8cpOi5MZyBwgEzCraBhfxTffsygOsFqQhK5oylB3SX8KSDE7fTSKFUhFlkpdHzCPhQUl9/Qkovdwzceliw+27UKq3dAPPl35vVA== 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=iqLfz1dbaQ6qO9YRpUudfDZxnFBGRsKpijVJfOz/sqA=; b=kxcotm1qt9VSvV25sOBZfxxuWybxCP2bjenZzD3Ty7fNlFxUMVsaYNCzyCEJenUWLDGCtGQHAbce23ZZwCiKhjXDb8h86Q63SOKm5wIniQ1/H5dBvEzW6Al3A4Gn7SLQxgcJdmstsCvQEK19KrnMDwTyaKi7KYGdLvf/+JN+NrhePjwyf7qhdtj5bx3DZf64FZjgLGz0lRkjjEL+Iu9l0gMT0n4aobcg3Cpuifk0nXci+A6g0GflpkMeJ8GxV8FCoqpi0a4eoClpW+VIbUF909wTAiDAqroRm27a27XdpoYYvyVaUNovKzS//8aoiAZc38ccLkSW3bTZ1BF34Zw6GA== 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=iqLfz1dbaQ6qO9YRpUudfDZxnFBGRsKpijVJfOz/sqA=; b=mcnVWrYY+3SXQWCfVAuWaXzjgNfL0zuoF3Bac/jl7iKFeviy5cbIK1Xt96Gd8rl2xAf62s2KcMSJQnwWDkszcX9XD4RrCXyAo2oLc0D7Cbgasf/zEmtW7Zm+PB1rEe9n3GT8qT209oYtvenoyX0IByF7volADU0gOMATYGFdBXB4jY/1KRGczEzNzK04diHZsdRPVNCm/acILsaJBztfHOGw5gMGcse4CrvjaLtFL2zCRXA8MlpnWF3ozVLX1ivRNPfx/xXPqHyyRvpJEw9iwjGVH5NSMeNs/rHLSQwZ4BkOufVgLK/G0ghqvUvkKPq4T+ByU7zN0S2szbVZdiP6Ig== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4951.eurprd03.prod.outlook.com (2603:10a6:20b:82::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Fri, 8 Oct 2021 08:14:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Fri, 8 Oct 2021 08:14:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:14:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [fY96nPB63gEqpnJVXE6NvzmrGYKeuSKY] X-ClientProxiedBy: AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211008081440.1156233-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.4 via Frontend Transport; Fri, 8 Oct 2021 08:14:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a79ab9d8-0090-4d68-bab4-08d98a33b3c2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQkYSKJ5lHLQC1UaOPRuftlGYWDteCuo3CpJjocq+8am/RRtD5AkO76s8xAsyYePYd6zqncErMY1v/Ji5wFALlYUk5Jm2sKmdxZeDJQ0u7637U5ofOyC13p+4IH9bO5TQC5BDQwoZQ36qM7dySTexSZdZLYCmKeo+zUxroauat5fEK5IcUVNciubYdN/sof78/3lWDFm8x9tmSb7nnAJdwWVEf/bv1Rc1v9vUCvS7/A5rJwry/V6igln3iNMZlRTVSJuKjt2jZG03NP0h60yN50EjkKogAiyKbI/9h3Sw4vcci6lWOB423DCf8WvNhCVMq0m3R36hvcVGsgGVWChJZPNx/06YUWOwe4bl8IbBMdh+jJqlkg7YRQSW3AXLSakaH7EXIvbCqk4/vl60KzKQsw3Bm3P5omgU2cJYJfyUl8L5gXGNco66eTdMZnq+4wUry82bghgekfZWWyaY4LRkO8FFGrTHUTPbLFQQzYnAZNApN+3l579NMJ/3ifvVJQfNMa6Bk0ApC1sg6c7pZH26yECCTDqyBgk9vB9HBl0P5s+Dv6eNJlltndNScj8QjvAR/1RY503y2gOlA1uFF81hZXtZiF5DAwg6vUSqjMaZdrqEc7srBiP3amGNREDcU7Vh7KVOsA6GD6xCGFxnhCCxs2V3xAyV4SR8IZAwUT4G+/tWMHbsZ/8VL5Z/tUiGnCnpvERaUAxeNCPtB65Cm2gl5WC0wOiAoCpxKY9TkxcseHBTTPbjQd2VZ1JqDKHr7P+Qo= X-MS-TrafficTypeDiagnostic: AM6PR03MB4951: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1vkBd6jwXHCbV+14Ue1oABaswyfm4mjCKl5oyj/uBqviMyEP/JKDwreseZqSAgHGuftVmpaUZAa0dP3hosOeuocJ8bjZfkE9Jmw3WYVsbJw7a9G5saEJOjSjA4zAYpXTvAnXq+lAPr7XD678sUbfxkrGQNi3hKn7NTvQKhT7k602Hbw1z/GoVGLy4kBQsKvoMqo/NT/oiBvqkfQLoI86vmvCyTWcyM+dJhqNQr7dDbjIcRxglCcz1U+OziBfSNQz793fjd1wQX8f8NAe8GsImjAhHb/0v5ykJ28IcBHxO0ATWIGhL25WR+8peaNKlyzl+HWZvqI7wVPFKfr+/mXf2DsjHfPTjSTKmW1up95L9LUHrjiTOj+j+Xpw8Jn0wWdu9LGyqU5eu1nauCiVCPJM8tieNphhTP/N+RV6o6A7EZj6zAaMhUECoPCBE9bf2bky X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MgHAYWEuVJLzs3kbCy9HMNKPo0MZ5iWWITlDVnLJeicoJyg9bTFKrB890XDMsbZFk+m2fqPV2pytE5evj9Wl54y4UuVK42yno5F7bolUDoi3OBFV402X8BqhNCYBK362r3HjvoQNBBUN/l2GKQ2N3Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a79ab9d8-0090-4d68-bab4-08d98a33b3c2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 08:14:51.6073 (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: AM6PR03MB4951 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffmpeg: Fix crash when flushing non-fully setup output stream 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: +NPz9IJlkquU The output stream's packet may not have been allocated at that point. This happens when quitting in the following command line: $ ./ffmpeg -lavfi abuffer=sample_fmt=u8:sample_rate=48000:channel_layout=stereo -f null - Signed-off-by: Andreas Rheinhardt --- Is there actually a reason that this packet is not allocated together with the input/output stream (instead checking every time in the non-init codepath)? fftools/ffmpeg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index bb29e3cec5..0e38d6d185 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1981,6 +1981,9 @@ static void flush_encoders(void) AVPacket *pkt = ost->pkt; int pkt_size; + if (!pkt) + break; + switch (enc->codec_type) { case AVMEDIA_TYPE_AUDIO: desc = "audio"; From patchwork Fri Oct 8 08:14: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: 30997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp625370ioa; Fri, 8 Oct 2021 01:15:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaZ1H5R0TvbjUkikShH8l8vreV1TYCJCiowSSf02rZJROyuiaD2okGxDoJ/zO7Q+mAm2Ni X-Received: by 2002:a05:6402:3554:: with SMTP id f20mr7941808edd.210.1633680925667; Fri, 08 Oct 2021 01:15:25 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw2si4086159ejc.730.2021.10.08.01.15.24; Fri, 08 Oct 2021 01:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=DGxkw2Sh; 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 7055068A799; Fri, 8 Oct 2021 11:15:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065060.outbound.protection.outlook.com [40.92.65.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AC2668A4CA for ; Fri, 8 Oct 2021 11:15:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PMH6f8NnRvrjtfHu+O2QQ4cs/Qfi/Mk0bQttXctlInrMqu8e8oDTjZj+BxhKUrIgWDBAs7dUokc8ipqDY/1YpjVVUNc7GdkLSaL9Aw/Vd2G1hIYidcG7faHnXtD48o9UuN+OnyhrGzCM/AYw3TpM4nfesleIZ7WCbfdIVxK57LNV65Yr47xjCmVyZI5LRxJW8CxCFerSBkNQVXsfmBq9aGUuZL/UnG9i7cAEhZ5JFDqFvBT5UY7FyY+EpIssdMPu/sxlJwNSgdvh08CGvAxDMruJyzXboHhq1cTab4W3/slNk4AVcPNhpUU8kIioouWHMYCWJ/tT6lum8kLFFGIQTw== 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=jQ0t2DrSdGax/ew2neoJfONi/8lQsPJH9bSUrNLcALs=; b=Acr0uO+RclrRJtCpxjcvCpH2MX0HO4iHEVmIMB+p3bAJjCLHHQDmtZdnxxFVdzYD1hPGfAA3g6H/SIOwFk66QS/gG/GO5H12CF1/dFbn4/hLKSZ+7do7SGTO6uEgRD+I/I5wYwkHo4Ap/uZqxQGahwPuVtkEtp1pj0ZovypMcqvdIpnB3sgoNcSqhQSsBDG51nOv9bVCxHA2zFX4T/QRPi9dR+NAoh+UliF08HP93LNV3ihYYpCqMiLptgD5nS6td0VwAlLEiiA6S9Zo5Gqj21j0Xl+GKP/nvi+LCOftcODinSjiK/dl+7TvVknNgd8jTsE4eHzzAniER9+b8cLu5g== 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=jQ0t2DrSdGax/ew2neoJfONi/8lQsPJH9bSUrNLcALs=; b=DGxkw2ShHOSo1zlvK/A7cA7gQJD+mCpmdbyx+zGPQthE0bVxxpt6pa/E9WMYb4gWXkkOt3sx9r55OkYjb1/4SbS8gUNXK3W28unibZNot/wtpe2Wet6B4MItHVIQvwV5nUyKkSuShHEuW+eKENONE3zn+Y2JK2ALum1qicj6UMpu3x9/L7WdhWR8tBJSR/YWsWgDA7mR88ncOzAAZl2HMhEzNLAOG/c634HDE9qyFQJiT9BjRdyeaI17lt8LuJ0Bm8a0nAXHN7PFmLbJ9C+iryR1iMcgCzxzODMUTINUs1tLgSIyu5m+I1OG5eUjXs4rEO4Bo2nZ9DS6AHi5lnnKiA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4951.eurprd03.prod.outlook.com (2603:10a6:20b:82::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Fri, 8 Oct 2021 08:14:53 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Fri, 8 Oct 2021 08:14:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Oct 2021 10:14:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/taXRTd3wH3kxrnLkCnjcHxmIhsiyPHs] X-ClientProxiedBy: AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211008081440.1156233-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by AM3PR07CA0076.eurprd07.prod.outlook.com (2603:10a6:207:4::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.4 via Frontend Transport; Fri, 8 Oct 2021 08:14:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84dac7d7-57e8-470e-632a-08d98a33b4ac X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQkYSKJ5lHLQC1UaOPRuftloUPh6k4Or+7vulnFfktSEcPLq5hdJ7HsovCrmbAuUjr/JCO0mjQWzC1WBk5o99ebWOIZLD8S6Lztl8Ty5sHwgUlhDG0GQimOo47j3Z9+z5vWIJSr9L+0auwi2rauvuElFxyOkMqOCF2YUkhR+Sz3OuEx5uzb0xHUJkjX0br0C3+h5iSYH7qXl24yTZFYGinO17z64SgV5NNIxS3c750E6W8qfVQa5hoUAnuhbuLP+hZYh90FXgpDNzxvx4mLhb2mD9aLd5hqeygsBF+PATeQ3l7RBq9vG2JjBEm6lfhP3gBFAcZN5Ml5FjQqvUjSZvhhTn2AcvHGPeiqKFfavVnNJ1izHebEI5wCmOLmWKEBA5EUFy4Sowoms/b7e4riPIcoQL3CO6igbYXw8dQa7fIitnfyhw1ViuWl5HXYn4vnmA0YGd/dt/qQkopAad9872UMcczVZI2WfjLSS1juu+/+zdX4xWSsGQ7iIKvqjQHI4GMR0KPqSodhGcTxFUkJ+ZsjF1Y0i5oOuENrSOMpfydPVGiinwAiP6KgochAaOSO4Q95EDJQA6QGki6v2xDg/LNv3/r2KXGjIA7EMvbEkpKIiZEvCutg1UxJGAfMzD/RgJTxXFNIYjj6UWyef2EMnPFay5QhWBkBrUPjssV4ezIkPtZ43rI57jT8ntmiDSiQWEMuxdeV06YB+UXPCnRgtvO/H2RFnqyQ4E3I+J4cbkB7z8tTcLHzfIbRC4DsEqY56Xg= X-MS-TrafficTypeDiagnostic: AM6PR03MB4951: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o6Cx5lEFtBwOUPzMaSsKq8xeNAIox+uuMaXTuruYeByljSpF6TKnH76NdJVbKlzY7nw42bVkfdiqHjGiaD7lnTO4SLzQ9pEck346VEb8h/V0vSYgrXW+/K1v/GY75PwzxBQRdC71mbNtLvxoWIzsq8FfCx7uThFrZ8b4aHAsZX7Q30jX76KPz4SU5uTX9Jjvkyz9kEOUfqBNiewvbkmPZTZfz9pq8mqxrN95T1lZk4bdRB5XhAMCn28koSoTe1gaBIrayK5EhL/0Kd6zqk70ft/GOJ9pAK5MdeDthFaSKW61D/+BOuOhtQjuqLRh34eD63n3x4VTBRdEuS9N06c1z6sevmhTb24dxMQp3TS5stCMKChkHR5/NwVyhSoiG2SBtPC288z/kh9xIN0CiCEr1JczcVBt3d+l8r6bkC71HbVVXQzPdaZ9YE1gLNUqDYIq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: unB3nYFnvHPYZ05aRotJcpqgkpwBIAul1pxvyADbBz5DckA7wn8WoXwkXFvKyR2QiPvtTSjcqn45FH0zYKFX1QRCx4WOpWi2B4DdDNWtgL6zp2Y2oKEnrV4J9anaGWivpdO5yDx4AjHcXNFASrnIcA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84dac7d7-57e8-470e-632a-08d98a33b4ac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 08:14:53.0798 (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: AM6PR03MB4951 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg: Remove unnecessary av_packet_unref() 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: uELzuk58r2lQ avcodec_receive_packet() already unreferences the packet on its own. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0e38d6d185..14611480f1 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1033,7 +1033,6 @@ static void do_audio_out(OutputFile *of, OutputStream *ost, goto error; while (1) { - av_packet_unref(pkt); ret = avcodec_receive_packet(enc, pkt); if (ret == AVERROR(EAGAIN)) break; @@ -1378,7 +1377,6 @@ static void do_video_out(OutputFile *of, av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC); while (1) { - av_packet_unref(pkt); ret = avcodec_receive_packet(enc, pkt); update_benchmark("encode_video %d.%d", ost->file_index, ost->index); if (ret == AVERROR(EAGAIN)) @@ -1997,7 +1995,6 @@ static void flush_encoders(void) update_benchmark(NULL); - av_packet_unref(pkt); while ((ret = avcodec_receive_packet(enc, pkt)) == AVERROR(EAGAIN)) { ret = avcodec_send_frame(enc, NULL); if (ret < 0) {