From patchwork Mon Apr 19 02:06: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: 26974 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp684808yba; Sun, 18 Apr 2021 19:07:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPdTDn+JFovI17dBxnWWWwNT2egTDw6ag8GFsvM287dHuk3X6ZyXGZFmbMRygSIBKgnabf X-Received: by 2002:aa7:d046:: with SMTP id n6mr22116086edo.357.1618798033520; Sun, 18 Apr 2021 19:07: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 kg1si10661289ejc.507.2021.04.18.19.07.13; Sun, 18 Apr 2021 19:07: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=DxTYoEEk; 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 98BC4680BE0; Mon, 19 Apr 2021 05:06:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069074.outbound.protection.outlook.com [40.92.69.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67AC2680AF3 for ; Mon, 19 Apr 2021 05:06:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dnmYJQkktjt9SP20NSbu481TFI3BByQsMVZhV0BDW2PptelaqwcFvOBpRl5rWK8Iqs1WFw16R6cF1RsKwBoYV4eGnb3JU/JZZQlByRsGdUnigGiq6CTXMYy8b+lX82drTWoC9s+UCTrKesFYdAmVTsxD0dLDURM7I4zxaOYkcjJsrVhuRj23FV7nRnegys008HOgL4VLK1p8mcWkjGEO0QhQh/kM1FP3kZxhoqs5xgSp1L/UB7uccPyYjKLs/kuXEuTn4stGHMzV4+OwgSCrHSs2HQfHARGjn3dX4YAcnBbwGcrKgQdqy3hsZM6cRjUH4Pj6KSpnwa+ukvvEJK3FUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=To/aqpfzxXr8acykOvHr6o+i4QHrxp88D2Eh/c14ItM=; b=OxSUOY4NSsinQNz0lJG3FkoH/mGNf4i+QrNdeUO7yq2tyM9KqZhOLeAu2x/ZwA4JHEBVek3u/SrjiJyAMDKROEWnyc7X87QgH+ML2K8RkQCQAvBS24pWA+MQ1jgE6csHdF/C8WA4NEI0eQ0IOjILhrIQsPWQ2bmM/kts7Ni4EBQc4jFYONJ0dkwGYpKtByPlOtHYXCQoIyyzzGpRpjLaZ/575LOeW9wYUaEUG4a8yY8NXkIlepIYwjkoJab4UvCmN6BgdsZjMhndHSduyTvFG25wYjIE2YQI4bXS6S/k//chOL8I4KUvsBe7hy0nEd1C/qz0qfcb4k8Y4zuCw4kMIw== 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=To/aqpfzxXr8acykOvHr6o+i4QHrxp88D2Eh/c14ItM=; b=DxTYoEEkqnXZY4TNBSubdNCMfHv2DQT+6y83t3IhmVJGL9g/LvFFNwiTF0GFXzPr6NdfhgF7lW9iMyFwJSFJi9f+weOPKsP07E3HIHkIXc2MSuK1xJ4d992Zn7js6SBm9gwV1tbXrM0SW5YWp8AuzZuq2hbQCwWCpjNJPovLpclwxfgukcY7I6Vr9Nh0EtehdkrY5lffO0/619rkhEgTuHiIrlRx+LIw7ELyoQELJG3FN86Pj9NILcuHBkBnOg/DcMw9Y58Winjw1WP5Vhc/BPiZbc0mErv7nwuUv37h6cHM+m6xTKbHhe2+xyS+6za2YqVLHDRmGPyX+xj7WAlsZA== Received: from HE1EUR02FT005.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::4d) by HE1EUR02HT126.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Mon, 19 Apr 2021 02:06:30 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02FT005.mail.protection.outlook.com (2a01:111:e400:7e1d::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Mon, 19 Apr 2021 02:06:30 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:19C2FC0DA965B455FBF229800423A22BD7A6CA303A3C92E5DA46DD0704EDF432; UpperCasedChecksum:F722A53386FA09672687784F19E0BD2F24A411040EDD45C136FAAB5C0E831A96; SizeAsReceived:7609; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.024; Mon, 19 Apr 2021 02:06:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 04:06:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [aL3mzZfADctlCfo+keNMP6ToqDTnEjpA] X-ClientProxiedBy: AM4PR0501CA0051.eurprd05.prod.outlook.com (2603:10a6:200:68::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210419020614.92961-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0501CA0051.eurprd05.prod.outlook.com (2603:10a6:200:68::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.19 via Frontend Transport; Mon, 19 Apr 2021 02:06:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b96e0007-10e0-47ed-035f-08d902d7bf72 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRNkiklivKM3qJlbManCLlc4TuaB4C1isb/l1492b3Dq+aqxo9pRWPOgREofphjc482tsedRt34U4VyXSYAOFEUMs8T0swj69aTlTSfikDm4DfrW/QeZqxYiwt24MImFY7MmBZdw9urrgADi2KHLsXWBiNCnVqlZCpQsnD75HDdhKrEBzDbUk2riFVlR4gNj/J89Wt4TcuQODXFfHY0G1YmfuJsQuo4bKnuz6BJYrFY9eoVuvl/lSu0Iua5Vjcattp6c9uQfNgM6kndVC8aHcVDYZTpq4T5bWLQ1YVeSBPGDhMDILqoD2eo/NDT2uZLYigLiizYMkEsMeVuNt7C/nQPC6Mz9PgQlye3gfTasGaAU7n9HeG+wjF/rDY6a+Z2dilZQpfmOPMUOFoUe/NkgQF4wzghqMHToiLnVfg5fCR+C5lbP+BnfTXGggDKoCuvJt8343a1Q2iXfnCT9652hu5iVNBNcsL7L9wN3qEMKc1LsGoR7wSYjuhMZiV4FItD3z0I0Fqdh0u4uGFbojj1Jhg6PSs6m17j50+I1ZxEiTgqzGgDC5R5dsr71W1KAHqWqpmSvtOBtNl1HpwD57OPeSYhVx17hfoXuJdXUgqiXD3nwzB32qM53tqN81S/uNSbxhUBCK7KhEykU/FRnyMrz+av7C2MszoqkvttvpXVn4CRK+U9qbAu9Ff2CCI0/zZiM0alJpthuDOpLAseCVYbCLX8VUk0xfOukOQ0GL43gBilnfhZQwcSsXvkoIjz4Aypk8U= X-MS-TrafficTypeDiagnostic: HE1EUR02HT126: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SWAXeKiA+aUamh01GsBfDT2G9y6EmdeF/w+N7RrM54n4YpyDbt+g3Ke1YP6/3AgNpGuQ7fgU0AGGL738JK4J0lnbFLHH9jefpXKTliDZ7vymWLrqEOiWCS+2uVZZbOgYJzK0cP2ue1G+bVrnCijn5k8yMjJ2Lz4Z4npryYk63c6SoHPR+0YG86fRuAovnrbJ9J8rBzGyGfeJe+BwN8dGgod1yOEhP7JIJ4YsIDtNajSuSK+YgqT34CE1tWQPbNc85PBqQQsMbeK+CXOmL1odG3t3sjUtfzg1rHi33d2jRX79rWekyVDt1kwSfG0V3ao5a9E6VYeGFh6EJ8FvbW4gdJqpCu74LaGJXUcxviSTXlmWtJeDFP31+KbkB9+Ux1vuHqJLlleRDzY3K839PsO/uw== X-MS-Exchange-AntiSpam-MessageData: +F5xPeOiPpTT8B/VMqzsO+CcQK3av5382uniJKNoUX5Gp6EORgfObCp/QbwyarZKmLWe73AofoZep6cpyNCnSxNyUF2TePvB3KHhtfsUxooY1eX7AtngJvbG4uAI0mpHvGwhjAhodz+FGMtIKHfVXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b96e0007-10e0-47ed-035f-08d902d7bf72 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2021 02:06:30.4839 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT005.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT126 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/avcodec: Free frame_thread_encoder on avcodec_open2() 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: z111Y7MROaSJ Content-Length: 1038 The frame_thread_encoder has so far not been freed in case an error happened in avcodec_open2() after ff_frame_thread_encoder_init(). This commit changes this. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 24f6922d4f..6cff596f6a 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -399,6 +399,8 @@ free_and_end: avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP))) avctx->codec->close(avctx); + if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder) + ff_frame_thread_encoder_free(avctx); if (HAVE_THREADS && avci->thread_ctx) ff_thread_free(avctx);