From patchwork Tue Jun 15 23:32:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4312794iol; Tue, 15 Jun 2021 16:37:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjwLVtRpm+MwkGnYhSKRJWGSfhMHQcCaQEWPXx9Hl6DgIWO/yPGOR64GkcKz+iGA6RhhxZ X-Received: by 2002:a17:906:7842:: with SMTP id p2mr1936770ejm.487.1623800234707; Tue, 15 Jun 2021 16:37:14 -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 yd12si430268ejb.356.2021.06.15.16.37.14; Tue, 15 Jun 2021 16:37:14 -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=EWVr9kQP; 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 B799A689D7B; Wed, 16 Jun 2021 02:33:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2045.outbound.protection.outlook.com [40.92.89.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9471A689D48 for ; Wed, 16 Jun 2021 02:33:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FXP6X13+aZZsvBxM+mW0OH23mgShotwHB3ZDzpjVqlVQZUkkMatGgLXggPB70LjfC8P/WjLALroFT8psSzM66mNiwPt0D3okdtNm/kQx4MM90fG4wJMQCSA3gbcvjhgG5j+5kdolFmSTdWDMDHMq1sdONZEBMHozkOztwtPu3YMR6UiATIP0NL9id3dvXMxYzbolkUTHDEDqFLrskE2/7wwYBGWuMXcLXatwK/qGQQbMfJDUFyu3lcqdz9ZcXEnGwB/vVsNrebKoipbRI5WR7Vpn/6gPkEjgGEjttT8YiBlICQPSjt1EC7wEUPjDhM1QWMxZl0G5Y6mh5YTUZ4kgBA== 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=C8O7K1975ekHnW8dBWSwjppqbAk494Y1kncQypPiX/8=; b=enb2zqU0R9YYpPrXMEy20bIPi4TJ+1g5Ly/seAJ41+eW3/+8O2/IQsfO5WTHQ6teWXkJEMR01agn/SPJWA3Gx2CmORcq0CgPZO/8c1Mkh/WHrsAxb1Qx0uRvplwKL+bDdrFxShYESC/lSTdhyKJzmiEFiJYz2SfKk7CT8487jDPdd2bKfvdC/dBoq6s5NF6UkqKMhpHALDiMmE0f+Fv//XuJLM3v0DvfUHs6RqZLgeRsRy/nFds2r49aQMBUK8gl9K8uZ8oRK8iKp56CNKha9bK4Z7HoUkWkCXnU2pv4njDILECsmzUvKXtB1aA5A61mcp/M+MK+ZFVwZ1yEiCaHaw== 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=C8O7K1975ekHnW8dBWSwjppqbAk494Y1kncQypPiX/8=; b=EWVr9kQP8lGA7lgEcJ0dKKw2Je7U57Gsy6Z9ZVnBarkaoS4A9ZAGaB9Fup32jSOOgktwoHN7pzbT4iiMjBGfeZBK/Gj+mW6vf2gCUeOYHQTwVRdCiF/cb1cUB7dbgi3ZMYEGR9FynGbM3hHFn0LN5GCYryMvJsbDpF+RNdxj9Jo1PGbRZGjs5xBmt5BWaxIuJmJ2c5YOXUjvsv7xjOgfSEvze6vBOtKKcGmS3yuirULd1dZEe6wdzeYp2zrlyD5A3P13yVNNwzI+68JR0cEB0QgWIonpTPUjjXuaxQq4PPOjNDGDzHBaH5ayp2pb/pnne7UvK2Z2Svrl1wRf81gASQ== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::49) by DB8EUR05HT222.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::416) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 23:33:49 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05FT030.mail.protection.outlook.com (2a01:111:e400:fc0f::228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Tue, 15 Jun 2021 23:33:48 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:60F23BE93A7A05D1C78E65F410FF323E66FD3B3192EE21CE2EDB9FE4206EF1C9; UpperCasedChecksum:9481C528F1F510E6360D01C33C48B4BD8CDE79E8E9B1AFDDDBFE794123D76F2D; SizeAsReceived:7596; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 23:33:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:17 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [kidCm5eLWQ0px+njqQ2ymAaszVYo6CxY] X-ClientProxiedBy: PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210615233243.1173928-27-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by PR3P189CA0063.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:b4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Tue, 15 Jun 2021 23:33:48 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1e7c1fa9-438d-4c63-6029-08d930560696 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n4p9PDP/HNk3ukaMkcBvK/U2/MVwz7AXwc1xVgo2WzRxPr8Q0ldTeSBOlP6lipmFRI3IIWGXzU+5S9UgbrXG/TWxbQON1zmrqKTFkyhzEekG9bjpvqsyIl2+r8PjW0aHxluh2tm/eASUNzzQZ4lmg/fG+ZlZuxSwVMogEPxByMcxOxSUVXQKjwesd+TNE0K63EarNwcQezF1bnntFgyJr0ejQZlYeREPahT4/Z5VVoT5DPb8Fm6Hm4MuM6vdYhuSg2/y9UaAVj0jMOANqK07Ja9nOnNUrSONSOVpw/DJnp+Epsf1piJilHTAETrKQdmC5u+8RfQ6axLYz7KTETCfruSHzIHfUGwq1CzdUIEjci5hHikqTL7N6V1pMXROv+v1XAmFKwVTnidhWQPGRHJBVvFtGmV2ZbdYgcCIko+m91ZbrQ91BNTjENAveFLpV+ER8+4BTn8pRONHGsyVDAzPEeBLTUdWyrN20EKkxR31jh7bOezHmYhVjxFq84XuJLAuqXFMwOYTxgdb88D+LELI6psjsFd8Mtm5B3T5gYlO576RjL2p+DDpGDAUfA35WUqNHOFp1WwaL6C0RDv0b4+0E5nwZf1VvnsDeqzzZWKTHHXpzgURVczULWtDP758E80tnyTZP8taEL4QpMvTbwZFWBORaiH73HEVe91HBYRlkVLsf5SApKPNjehKCZSoogIKwMRZskAgwcf+f7qSBqBhHivLUWDclICb/s= X-MS-TrafficTypeDiagnostic: DB8EUR05HT222: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EQUoVj0avSFLyp70SMwd8M5Bt0CmOuT/jIjuycEsekUfbi9JZpcwYCA58nSx08c7RKsnRZH4vBrIenECHdTiFWcf60K4AnxBfduo88GtkQR02DPJc73VSEAyqqWTWzp7HW2NowrPqDBdEoO7Pf+tBirYwToTL5lefDYc78bTQeh7gpGtFyInN7gabu7wyKCLFnB8CZR99lJAUCGGvtwnmi0ggJh1dw+AvKNfDYCb5gTBmF0ygTVV6AReTm1OA3H3t+IkN/ddgEvb7+584xaGn73KfsqVkt+FRJ5JB3/sMvTjgIMVglQB2VCcyJla6I9uL8xpWhsuoldWydxS0m3OWNHY5trxTJffcDALBd1Y+g+4Qzmr4yA9we4msBZUm6/2 X-MS-Exchange-AntiSpam-MessageData: X0Vd0tEiJ5O/8bu2eHgpqkhrXCcVGEiEOOdQuzrEe7sJVKQmnZ9jtB1oRW40quAGfZc7HvBZlbPAnTnpSiAGz4wu2H2gMj0SlFdjs0XfJqTT7NQVv/nQRYQsD5LtbRlG7JEGha4km8MHNgTh+rB68Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e7c1fa9-438d-4c63-6029-08d930560696 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:48.7983 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT030.eop-eur05.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: DB8EUR05HT222 Subject: [FFmpeg-devel] [PATCH 28/54] avformat/mpsubdec: Simplify cleanup after read_header failure 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: QGoiQeka1RF+ by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/mpsubdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c index ee53be17d6..abf0e7fb9a 100644 --- a/libavformat/mpsubdec.c +++ b/libavformat/mpsubdec.c @@ -165,9 +165,6 @@ static int mpsub_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &mpsub->q); end: - if (res < 0) - ff_subtitles_queue_clean(&mpsub->q); - av_bprint_finalize(&buf, NULL); return res; } @@ -197,6 +194,7 @@ const AVInputFormat ff_mpsub_demuxer = { .name = "mpsub", .long_name = NULL_IF_CONFIG_SMALL("MPlayer subtitles"), .priv_data_size = sizeof(MPSubContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mpsub_probe, .read_header = mpsub_read_header, .read_packet = mpsub_read_packet,