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 7BCD546DA7 for ; Mon, 11 Sep 2023 15:30:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 769E868C93D; Mon, 11 Sep 2023 18:30:40 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2102.outbound.protection.outlook.com [40.92.90.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA15268BFF5 for ; Mon, 11 Sep 2023 18:30:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PA64K1iMOFYXyA5iUPR37xqzgI3QnEumTGom1J6AzgzdcBpCYf1dhlRDBc8YmdP1H8uU5Q2YN2cI+fFr0R0ip91MwJgBl5n6iRLDpNG/Dwgv6ytGUJZnmumguLpns/JRxIb+KFYJG/fxedu8+6EMHtwFVUuhIYOyvKKq5jLU10vDD8DxCxBZO3LMktWCQga7Ub5ItSTkLyUctB+Qp9dZ7wMMvn7StI50qpWiB7zveCfgw9pgPgrL97R33kjUgcQzgcucfPBI4M25OsYTks+CxRJqdEdfJttxYnhlVJa3D2bk0XjYBIEQcJimf5ph/ujdYFZNUWHnEeCa0xeZZ6UbCA== 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=6CeJGYi0d4/wTAU1aiwoNEw/B+NzocBWs9Ir/CLvQEQ=; b=FQ17FYgaVJHp4gpwU2O3Rd671xLuzQHlcNnFOyeOAYZwKyxVtRKPGDYvIST75JLMSU9uuVkWWLyflcwleMxSIYI2DPD7sAU6OmLLE++Bytn+npyyUm20OqQfT0wSxWxOpQyHTGHD89L1ajQMliLOGB2lUqG16moAGJFBHRirwGJ/SIMQE5lOoOOz50XXXEjDlhU/usQ7gZZzHCRLdYnksJPJa5ll8d3xXnmwWTNAmApriVn4J+90xy3lZRQ6CYErk+rdOvgwd5Ccq6Qexjm8xFhUD746gJjM47PRSxQMBrACh2Li0gpD2eDTwqosNHsNgTbjfmWDI76aejuMH8CINQ== 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=6CeJGYi0d4/wTAU1aiwoNEw/B+NzocBWs9Ir/CLvQEQ=; b=uurfOLqYa4xB8KRrr8rXqYalUzc/TNb0//yBiD2UHxkCsy0dcj8jKH+EaSgje/CikBf5g6nyHyiyp6mhMqLWaFxIJLjz9NYubQS4gip88IzoPKyGENSrcXrYMouCq8ZR2arL3yzqbYkthx3ZtpszhB9UoDLdncgSZS6Pubir2fvapN5jTAm2XMvWnADUYMcUo7zKzosXgs82Mnbe9/YMfuFn8VE4ZxE6ifdGuKVNzmQqLCVgCn1lwpJSUE+kUR96Ees1y/FGpi2eSvgKky5gvmNFrR4IY3NmyABJyKIrBMpGroVexZvszDFs3PW729ux0HNXhAoY93Ra01LCCIW9ow== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0333.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 15:30:33 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 15:30:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 17:31:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [FNQzLR9LY55ebLKrlLhfM584nRw+OeXw] X-ClientProxiedBy: FR3P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230911153146.295637-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0333:EE_ X-MS-Office365-Filtering-Correlation-Id: e19b4b80-8514-419f-c86a-08dbb2dc09df X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yfe2JNvyXoGm3XRsU5y+sGoB5gzePfQxDjjT8zpgxVdbB25kTmJGJbopzqGpOcqjGnihPqsKekRVOls1BhYd3UUdQXHJhD5GH61625Nd+YXDUDOasHHCGcUvWfDDWj5JKdR3Ecy1r1KMn/+2t947HarUePVYWMatgMwH3hglSrNlJmdx6NHGFWGf2LhiamEETsTRyYWnFDAbSwF77FNN/W8kWQZhpYBGzMT0TdQ+uFX/t5DakVfLFyZoeQc5AExWJW37v65KZHn38Co3PFwYJ/o8i7Mfby4LAkhQOHMh5pf9ZDuIYsTMDILIHO8FjxExyIAL5IIQX7lXZoRWInGKcJ4cyVhv3W3Ul892PZ264S2o3yab3ls8WAz40rlt/MUzKg6wnwJ4iAvBhJtTnx9y8m3kYWAmzczqueQkcNjjYApXafLHDCD3XrrcXJrtC7AfVmtS5iZI9ZtNyXrfqMjHQmexVcd69cPhLUfY+TUAP0F6Oltr5o16FZ0pSVwTqbizgdyOnjZvaPL1LXhF4jhMVbeI4ZlntWRdUszFsD7g587c3sg1RjxHPDh3NjSEeUN4C81SevScLOs2t09mnJym4wJV0knf2JWZ+J7rVuVw6NUNs1UxBI2ATex9UtJWn9+K X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Prjb9DkoLhImtMdOsUtFhzXcvtYgiu8vrRN3VqEDHUxjJxUv3FUcHVS/Tee1?= =?us-ascii?Q?YJme1op5HvRT0Ophb/F/An5UeGiVPN2O40lOQuu8g8TXUMo8QGEMCU7lUzsh?= =?us-ascii?Q?wCJ96acpMybhgPmUHcMcglHMF2lYNoCU7lwr/AuTvtSF2EGAaHeBOYHDG2OW?= =?us-ascii?Q?hJ+dMkECnGqpUZeb17B8Ct47mffT6T+yHl8GWOTGTSFVFUwa4O3ZyoYbjSQ5?= =?us-ascii?Q?ktt3YOKKJRyf6YvdxbbY9WOJ0vt6IGuZ07klIkHIEQdNmXbm2LLPNWvdFB7f?= =?us-ascii?Q?W+yKtGwI8pFTrVrqgg0OdcFWYbbY8xDh5+JsI2iQ+5Nt2D3R/FRuWxOEGJne?= =?us-ascii?Q?OSnHvtvIn2DfEavRHyMk7Lo0SiYx0utJX0qw1lZWf3SU99ePEhqJZxAa06iS?= =?us-ascii?Q?pLzNnWeKXgHZfA78Tx4zTlKUUDS1GkV4j1ezT77cCO9izTNwlEq/GEZTv7G2?= =?us-ascii?Q?sgCSZ83eSNcqCMZnSakCVZUfU8a4lypPqgc6WJ7DLViYoHQZtE9VECOwc6pu?= =?us-ascii?Q?KRFSZniz3QSwEEyZrvxflflZXeDvFW+HsGOASRvLmlZ6D2PLQTHhhw2SWAFV?= =?us-ascii?Q?veRKBqQxSLNN5Mi5nJewWImv6psy0mSpNLNaa2cTi+xOjFRnyL4DSj3hAP7e?= =?us-ascii?Q?uKVyEo9GqpQRuAifYkFTrtyXwU5en94ZsRkZEH55nX/yszcg/M++89vzOfb7?= =?us-ascii?Q?wsUKxaBXNRl9Dhc6tXTSe1dP/oUi6ltSmFUJaBp4EKjulPl4WRNrQzPSGV2a?= =?us-ascii?Q?fZhLDwc43DrLLAiAiHv9NHBfQ2j41RaFcpcB6LGMl57ORWGYM1WYm40Kg1k7?= =?us-ascii?Q?Ru0oRK1AKJ7wLBKCeMECjtf2oBt+xf4YUZT08SLJSicjjz3l3rW0ygy9knXW?= =?us-ascii?Q?spUHox8CMmN4SsX6Q3Ru9Cn4IZY7AUD2lf9mIe+9MBwXp94bLQEdIJhZhmHu?= =?us-ascii?Q?xvQ9gBopa/dBElfM+a1S7nsJYz9f+5yiJetfi1mORdBp9MmnJLb5K//dU8vt?= =?us-ascii?Q?Zt+dfKMEJGNkidU9huV5ycYK7dPr1Q7uWKjsS8Zeuv+e/XOMFEgBkaQel6iV?= =?us-ascii?Q?6Md48RPa7k8woP/q7Yw5YmKQ9IIR/p499Sv4spULSFhUEeuCXv3ove9adz7o?= =?us-ascii?Q?6TcQvChcwPBjRxqKy8BApWEhGI82CQeJZp34a36jJNi6VTNGmSN7X4WGaH3V?= =?us-ascii?Q?qhMS/2us5+QORfecd42jzXhI7zOkScM+YE3uKkT8Lzv6YAqVLp8EJe8n2Tet?= =?us-ascii?Q?pBRMCuLrm6FnlvRBE2Vj?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e19b4b80-8514-419f-c86a-08dbb2dc09df X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 15:30:33.3845 (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: DU2P250MB0333 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/libaribb24: Use FF_CODEC_CAP_INIT_CLEANUP 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: libaribb24_close() does the same as the fail path in libaribb24_init(). Signed-off-by: Andreas Rheinhardt --- libavcodec/libaribb24.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index 551be89ffd..29479e375d 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -147,12 +147,12 @@ static int libaribb24_init(AVCodecContext *avctx) { Libaribb24Context *b24 = avctx->priv_data; void(* arib_dec_init)(arib_decoder_t* decoder) = NULL; - int ret_code = AVERROR_EXTERNAL; + int ret; int profile = avctx->profile; if (!(b24->lib_instance = arib_instance_new(avctx))) { av_log(avctx, AV_LOG_ERROR, "Failed to initialize libaribb24!\n"); - goto init_fail; + return AVERROR_EXTERNAL; } if (b24->aribb24_base_path) { @@ -165,11 +165,11 @@ static int libaribb24_init(AVCodecContext *avctx) if (!(b24->parser = arib_get_parser(b24->lib_instance))) { av_log(avctx, AV_LOG_ERROR, "Failed to initialize libaribb24 PES parser!\n"); - goto init_fail; + return AVERROR_EXTERNAL; } if (!(b24->decoder = arib_get_decoder(b24->lib_instance))) { av_log(avctx, AV_LOG_ERROR, "Failed to initialize libaribb24 decoder!\n"); - goto init_fail; + return AVERROR_EXTERNAL; } if (profile == AV_PROFILE_UNKNOWN) @@ -184,27 +184,16 @@ static int libaribb24_init(AVCodecContext *avctx) break; default: av_log(avctx, AV_LOG_ERROR, "Unknown or unsupported profile set!\n"); - ret_code = AVERROR(EINVAL); - goto init_fail; + return AVERROR(EINVAL); } arib_dec_init(b24->decoder); - if (libaribb24_generate_ass_header(avctx) < 0) { - ret_code = AVERROR(ENOMEM); - goto init_fail; - } + ret = libaribb24_generate_ass_header(avctx); + if (ret < 0) + return ret; return 0; - -init_fail: - if (b24->decoder) - arib_finalize_decoder(b24->decoder); - - if (b24->lib_instance) - arib_instance_destroy(b24->lib_instance); - - return ret_code; } static int libaribb24_close(AVCodecContext *avctx) @@ -410,7 +399,7 @@ const FFCodec ff_libaribb24_decoder = { .p.id = AV_CODEC_ID_ARIB_CAPTION, .p.priv_class = &aribb24_class, .p.wrapper_name = "libaribb24", - .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, .priv_data_size = sizeof(Libaribb24Context), .init = libaribb24_init, .close = libaribb24_close, -- 2.34.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".