From patchwork Wed Jan 26 21:34:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1882823iov; Wed, 26 Jan 2022 13:36:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMJkYVUTShpoypLmEojfHP/27W3WCX3x1ds8D8xCEj29q+710tNOH1nB+zE8h+dNbzwcka X-Received: by 2002:a05:6402:516d:: with SMTP id d13mr814415ede.333.1643232982298; Wed, 26 Jan 2022 13:36:22 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v8si197926ejv.536.2022.01.26.13.36.21; Wed, 26 Jan 2022 13:36:22 -0800 (PST) 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=sJKtj3WU; 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 A57BF68B11F; Wed, 26 Jan 2022 23:35:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071048.outbound.protection.outlook.com [40.92.71.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74C6068B0CE for ; Wed, 26 Jan 2022 23:35:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E0VGmdkIk5kFiWpoPgaD/GureBHhWCIpE8AcmPAfKW/FvPIhs946FaroTTE5O/Eb7RyguBOq/QXxVQoEtAGlPEbZQpf5D8JnoXTeB9T3yODeqfWS4lA0cJN42KK+bTs6QH/4utDzq/+gAWeWSfHddkqzRuLecMRv3wgLTu66SIN4e/tWtVMpEj3YBYu4hsgvwVK+BnZsIYNsi5B7elmkhzVzHaf3S9Z4aTHs4bfbH3MJIbJRS7ebBxyDtWLKvRBTEahIZ2SCS1ahrzJQjoVtBP/n8/KwDIEu1X9OlSDqGvqE4ae8ZB7i0qwYNirssIaGEUJ6ZMfPDtkd69bkXGAUSA== 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=S9qQ/XJMWOALFp5S28dxPQ4EFOFFa/aeaMDJ3YjM5RQ=; b=J+vVuBvAv6fqWIceiGKgCo6KCascz45LJHFZWGH9/4mNETwVAUd3JdPv16ojwMwHBTn1IY/qFycfOzp1SYQOr0uwlZWhVScrFMbfdXIlan8ir2EXInFDBDRUPQscJJMRU7kFtgKF+MaCXL8FoQT+7NjXGiH8F3W4rmHLI0iCmPFrh5xeAmnAoNYxGEaoicyil7Lmcb2NEFISp7LSJlj5Q4JgazWoHDB6OP0ZZSKzGO3f9lQLFfwy4gLDIARiAQVijwewapJAz3ujuShN5tduWuTUn+LTkvO7GR8AzlzT32MnFC2KjeFaYRhK7VfWH9Rz4Cilux4+i479fGAtKO2JeQ== 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=S9qQ/XJMWOALFp5S28dxPQ4EFOFFa/aeaMDJ3YjM5RQ=; b=sJKtj3WUoKadXSPuGaR1R08SBb6ZDk6axjYlwfwiHhR3ih+47KItCnuIPtzsAeklZ9qJAqB6AbbZMuhw7mkMkHyp/NDrV1QcCCNQKQV1+rZLmp9KLy0lesN+ioSxDMXrhrAbV+jRR19oZhlSmfubnpg3veQmTt4j5CxvBJAJb6CdPTqMAqy888ItUMBYJ1j62ZdcQ5obaeXWJXl8+2BS7G61SF/qV0HWuZr2wYymTjHARzliW47PSuQdExtUJomKi50PZA1GeecMvQMXyl7xzW/9xtYboWEhenVRNRu2Rb1pkktme9wAEjbdDry99NZUne3cIlJVetOHgm3/k1lVDA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBAPR03MB6406.eurprd03.prod.outlook.com (2603:10a6:10:190::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Wed, 26 Jan 2022 21:35:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.017; Wed, 26 Jan 2022 21:35:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jan 2022 22:34:47 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SVSLvGR7hLnZLeRlAFlwvLMzakSuZLpg] X-ClientProxiedBy: AM3PR03CA0066.eurprd03.prod.outlook.com (2603:10a6:207:5::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220126213451.1887291-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f13bef73-1e3c-4a4d-e975-08d9e113bdaa X-MS-TrafficTypeDiagnostic: DBAPR03MB6406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zmvF6o92UgFCtU8UDygjpWkPLPH07LpOksnIUXV5ycWYi0yg7rxbTqguBmwpF0b1zpQAmSRrXYfJS95F6LfTkOP8eSrjtHPe4rbVDnInsGh/GoEkV6sgXeXt0FTYtjwOZiuhYDN//PFbrrcwHoJOCgkw6Gwt1VQdhKitWj2cidTYIPbHseh6w/C+EoueAf7/SgqmKnVhFQDwCOn9yHFne0wEuDTcKqYSZk/L33pwmYJ+sUcSvEiUBntLy5edvp0YQKZqWwRy2dnklpTz4P69vk9wBa95hMumPcS0jvzggc82NxHCgasexclWRbxjNqbW8LXzhVAIJjb6P9XXiiko64JSph3XqCnfAUneNpfogfDG+Y+STOl9T19wOg00l4zbSR/kbr77e+YovI5oMz+Kvt8iS20xNh/V3Buoj8VIyNR8//5fJBO84YqnVqCbR1Fh651cKXOCSDEtffDw6Dqmry0vL5tTYZ9dFkrCTjW0Snh5ALT3iEJJJhjRwpGtwoQbd9TYHR1fn98XEp+3Lp/2KzvwF6Gx9El4cRY0lRHOXp4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RaPIh7tlRUclozLMPFFhaIkXsusW7LS3xSIJPMWlfCNJT6JLYE5HhegqBTMxBXaBy+n43dnq4WOIr2pM/+zEksldtbZa4HbZjLYeaWmsd73ltOCUBcS6QQZD3B2lH+fFDmIAYUu2+5IENKQuo0cCpMG/xrYOSj1YpEg4R2Z/AjQajd/Ugngg2XOx8RelVjL2JrCc8GlFXWJe1ejqOuaC7tma8wmFhZAhC5Y+nWACALd6AE3eQSuy3sAAXgTOfxN2Dai/UTVgNAQ3+R3nUAHZzGrll1QHGZ2kfd2j9IVXOa+r/tbFWSEnSULta+Eo0sM0gZcfgyO499nNHx9uoKPfPVsUAaNru+z3J6vOOtK2jd2Ik/8tFu/p+mpFuNUe8t65ATbSLAtDom0G+mN4sw/V5rsh8EopxkojTkm3Bd6iLo9EiozjYgpInTOBEvFYK5xyMb0TnkJT690mEepy4oL698Hv9CO5ck9JdcuCIaD+iVj7DuZ5qcIJ6EQbBO5LaAxwPzHlHqFOASky7zWL3y480/KhNEV5GC96yg80P792CJ4gGJJBgiL5hc6Q20LXg2QOFEscwYRHdHaKNK7ma9TBTjllWI8m5rnbDUYLtWPzcBt+1s61elLT3sVMuqc7wf9LN2RtPmorLtNTlu2SZ8GPq//7F+lE2T3e/T+R5zYUYZZSSGDcgSdOz38T1csBCZio3repGmP9XOyq8Ks/YOExfVMcUhmb+SPfzHLl2wqFbamCrINyyZGyjlNiBCyJajg/7LkP1klGHyV0+J92LISRtaWV4LTE/mzrn1MtnIW8VogZoTa6qB3Dst53maWSyScXB6dKfwLwVnHwx0r7ihRyE1LlGw2HF/FTMVcow4MFKDNFhAZmw0N2UuU9uvYWCFFE6RlJAP7nFWhnn5vNWRf9qLvsJ/c4GozYuGDCAHWmI17jzwhOLzn994f/aKTQ+5heS4ujUPOP7UPmG8/CmllIOw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f13bef73-1e3c-4a4d-e975-08d9e113bdaa X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 21:35:15.3452 (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: DBAPR03MB6406 Subject: [FFmpeg-devel] [PATCH 29/33] avcodec/mpegpicture: Let ff_mpeg_unref_picture() free picture tables 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: nbra5dr88H6R Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 0652b7c879..f78a3c23e3 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -290,7 +290,8 @@ fail: } /** - * Deallocate a picture. + * Deallocate a picture; frees the picture tables in case they + * need to be reallocated anyway. */ void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) { @@ -443,8 +444,6 @@ int ff_find_unused_picture(AVCodecContext *avctx, Picture *picture, int shared) if (ret >= 0 && ret < MAX_PICTURE_COUNT) { if (picture[ret].needs_realloc) { - picture[ret].needs_realloc = 0; - ff_free_picture_tables(&picture[ret]); ff_mpeg_unref_picture(avctx, &picture[ret]); } }