From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2667D4A7D3 for ; Sat, 11 May 2024 20:52:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27F2B68D4D6; Sat, 11 May 2024 23:52:14 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2073.outbound.protection.outlook.com [40.92.74.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4301568D2F6 for ; Sat, 11 May 2024 23:52:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ru4ZNJFUIHnerrtYudYkBddqG/nFhYgUJ8ZwsUwhxsj9M631+Kyto5cpbBiXvW8YxeQL+y/MBMZSqVy3clGJrCMPwyLUSQzG35iOxwjYL0VAV4ty/of/GeNTHyr5MGhBhUAfjcHg6Rto8784lLT47dElitUv4K5njQb6NdJLgKlcOvoPmy7XeAal9UkwN2rJAkoUHV6aAz0FiMQMTb61ELBeRK0NIfZpivSuZ/F/D4ZtRTCbBEk9drdqmVyzFxgPI3OlGgKEYSu6sQY6AT7Rx28JK3+9xfVk1Y+zKXo5ivd6BjBGa2lMhLrvlAKASg1N3ZoQw3H5wYASlurg9zHkBQ== 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=OV19Ko0RdD19icqPLGdp10av9v2JX4LjSpzoam5PPes=; b=W4J1/weEVC46bMYcjCzAilOYeVXCbnenHgsQZ8ptevWiqAhyHjqrHGY7nm0zL+vRNZK/fY36ra94N5ZuN/wpdlkquh6ZS7UnO9YmSyQHxIaMHtJmYtARE+TZIbylgrJ2xjvtW4cjARlB9NXWQWberE5t7NQaijXBwIucv30cc/KIDK7WeF4AZB8u1ghcMrt2dOsnJ/W40R3/isMb5rUw7gWO0SLdrv75hP0kYfPuzDyytrpU+U+Wqi0TXD6/x2iA6bUjkxt8SyJ7vC4EHkEWhq3OLmWxJrrd2FJwxa7JDKp4CjjKUDvRtDMskiBnNkgplQhMfs7rbw0g2XnJhNx2QQ== 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=OV19Ko0RdD19icqPLGdp10av9v2JX4LjSpzoam5PPes=; b=qbRwJmEoi9ZZQscOQmnTWuqh0V6q+zrnkoYkTHMN/uhwQUGqsBc/ZKM1/2NL2D4hXp/IsW5cBmtEzs5E0yGF4xNol+vSDJkhbkOubqOM8MHgMSzTE+QTxBvccplQZRxvo3b1x/EOOQCFAKHrR9uanOoMw9jqppQRdME4ikcRWxEu0TTdp5B11PI42IQopNbW6CjXU/rWJiPHIbigRtGHerufXngADCFgnpxrbbsyKdEiuX9zmMKEHc1yEGJ7wdRYKjckvnMvyTSoVHpx+dQE3pTVfNGtFsZvVWv2hZTZmA9jZITid/5Qv3orkKsen8q+fWbFGdKiDBwrOCbINVJZEg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0449.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.51; Sat, 11 May 2024 20:52:05 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:52:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ddohlz8JXXdIR+yEdd8OXjmGKJcyYO/mjYGIYTKYe5s=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0449:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d0884f1-2733-4f27-f515-08dc71fc36fb X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: Q5Wi/ZXdeARPwY9gaMbxwRQXOzOzn2OOfjnZyh9K/zHvxvfR0/qmgTSETV2pqIel6WMDnLfbNjpQvCFd+Mh0ZOCwJ4RtHSuaSMAzkwmlrrkBeTHcMG+ZQEbb3KyQusHfQtUHWBhMuJ6Hm4NTzu+0dGlvjrmN5Gc48wdB2Mpi85uae+Ps/0u5r0iFcZfHCF33483mBIYHpMEM6CY10EBaSMEwIXOSC246XXC0INZ+G6sh/S6rR2h2272VCTjmCgkVT7tCsURLeCPh/34izIgCCpxydRIbcFSoxB7d5GEYbC7qM7TJQnOfVa7EVzVNbjLYCI4erfdmect9cuIE1bWNbC44N7swFgj8RNuG7NVkqftd0TMZfBvjkr284CiQWFXoF+gW7fwqfOoZ4SHMtTw9EWCGjdPUMrUTfUub9Hu5+zUQuAvPpmHPsdm+YgM68F85zGtJqj3GU10LDziRASMi1Bmmc49VLoJMdhuRaIslqNk7Ro+bO+P93jjVSnHbAoKAsgTIA5TopPXH34sM8PA8EBuPOFjAk0FhcyMfE2HNFJGai0N6Eg2M/SxCA4LTAq7Ov1yic1tunxj34jTvsP+rSX7sm03Fao1jWjTDGpkxNGgli4rohq94ng8Wf9ioFhdU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eczmqSevcvrbLCDXOqwnb1SEnP8Rl5D5/SMVmSnpzITY9CQhyekpAJtSl1g6?= =?us-ascii?Q?UJYL5dylAtTACyYl3ROeFygcgEX2ECFZ19oQI/i7RKhYKj6OD8pEhX297f3M?= =?us-ascii?Q?980BzPMO43t8tRln4ouuT1RfgOqcLZIXYTChkK23ulg3JGdwMzpKs5AFgAuu?= =?us-ascii?Q?MVNbzyGgSKa6AyQOHiDR0SJ1OtgIB+RakVFZRv+3xOXTfdtlXpgmFvJBYIjl?= =?us-ascii?Q?Hts0yV0Q93LsOa/Be5Zw+RZZEds34a7H4JpdLVkTblMi5c1zueLbx1uD4fAC?= =?us-ascii?Q?REveR+sDEAQH20V0rhigNTCA23GxI1OM3mS/kJNon22FGLAyODDp8D/1FL/0?= =?us-ascii?Q?JMakw5+xNTiVD8lLTyXr2KEwZ592ClhvqXdWr0zK2PfKplM9TQV/Se5ntnKr?= =?us-ascii?Q?eE7zBaEAi9VCqctqWGZT68b9b2G4gtUf1ZnvjiA5JwPhSU0zjNqHXNeyhCqi?= =?us-ascii?Q?j0wwuLH5JprDzUEJXHdjpXhWR28WwECtoJXDXnnPitJXEaGfr1F7yqJWUGq2?= =?us-ascii?Q?jByJidSD/IVEqNd9Am82+2m64K/kQRAYRUG9wnI2FgkhiRSeg20Am3FyoqOw?= =?us-ascii?Q?NV8zo49ixj5LSgJ+6uqJJzUKb956vbLMXfCZq5Ir3qdmyPrk9VTyWtcjzOg2?= =?us-ascii?Q?1kqrSqdysTRkKT/ND04dA9Aj5qwR2gOuQNLmdCU4vV1jit1w3rMBWmigfA8K?= =?us-ascii?Q?d1JvIK5qjonxsoevobQsaFwe8qYd9KFVc7CEXUHuJSkM5l2ORMBjckBHsvFu?= =?us-ascii?Q?LBwQqi2s7i0oKXutEiTyuUalRswVYNOjSt+ryk+pVC1fYogof0jbRUNOHob4?= =?us-ascii?Q?+7/hUUe0mvmGfNfXJnh1/TkEOJOV0ojbmTtzUvgpNEkXlGEen+4xDOrQ3aUR?= =?us-ascii?Q?Q2HS4XrDSaj5Hr7aKhrh6AyuwpNLD/y3OfeDej8jsDU0pyvlGfI+X9I28d/1?= =?us-ascii?Q?1Xwi/ysE9S/lpJotxnsDe9I89MIFKAPscknocTIWFzCSV/jr3M0m+sGI7sar?= =?us-ascii?Q?hYy54W/6tCbicYmwfF8s3tbfFaRghwDfS/WJRe9Mq2fBqcgMsYT1+oTYKsjT?= =?us-ascii?Q?4wCMdBv6GdVnVNiuBtqsBRSM3V4W7Zvy3KeN4/pKnxNza8Zp01c+iNX7Zx06?= =?us-ascii?Q?ooA6y0f8yVB2HMqNNrZU9Mott18rPNQniZrEVUrhCYnWDy44vSEEop0VrmXW?= =?us-ascii?Q?ErdofiZn1hGP/cZ/f/rPT80t93X3vf4w+SZxm4GOo1EmdbKH63j5SRYZEE96?= =?us-ascii?Q?QbifZOnOmyDvmfFsl5TGjhnRvtu56CT/dZArYBZxWw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d0884f1-2733-4f27-f515-08dc71fc36fb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:52:05.1206 (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: DB9P250MB0449 Subject: [FFmpeg-devel] [PATCH v2 03/71] avcodec/ratecontrol: Don't call ff_rate_control_uninit() ourselves 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is currently done inconsistently: Only one error path (namely the one from init_pass2()) made ff_rate_control_init() call ff_rate_control_uninit(); in other error paths cleanup was left to the caller. Given that the only caller of this function already performs the necessary cleanup this commit changes this to always rely on the caller to perform cleanup on error. Also return the error code from init_pass2(). Signed-off-by: Andreas Rheinhardt --- libavcodec/ratecontrol.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 78022d80aa..3219e1f60f 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -622,10 +622,9 @@ av_cold int ff_rate_control_init(MpegEncContext *s) p = next; } - if (init_pass2(s) < 0) { - ff_rate_control_uninit(rcc); - return -1; - } + res = init_pass2(s); + if (res < 0) + return res; } if (!(s->avctx->flags & AV_CODEC_FLAG_PASS2)) { -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".