From patchwork Tue Jun 15 23:32:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4314461iol; Tue, 15 Jun 2021 16:40:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKkBcQkKszOgn48BiwQXdE4cRvwOXMqLXFR8PmiEScWGSSQnbhlkpRsecXf6Kz4o58NNTn X-Received: by 2002:a17:907:9801:: with SMTP id ji1mr2070831ejc.523.1623800409842; Tue, 15 Jun 2021 16:40:09 -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 z11si391703eja.613.2021.06.15.16.40.05; Tue, 15 Jun 2021 16:40:09 -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=A9d4vlIU; 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 965C6689F20; Wed, 16 Jun 2021 02:34:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2102.outbound.protection.outlook.com [40.92.91.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A942C689FB5 for ; Wed, 16 Jun 2021 02:34:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+yS1RtHZm9JpYVAdjsk4INyA60/06lHF7jEaiyjGAdVBlmsR9jCFfFzc3Tzn7hvrwp3w0j/qgMkAy/l8eDTPM8dqd7YM6fxIpkxli+10XHdNKIBfqSlxm8wsqG3KcH4TQ5Z9p/nCKJ/lIrZY7WUotMovejxbhtZLNM7+Q1aabfKhQMQv20lnp+V5zvBHqgFkYD/P5Bm5xoYpUFzW5k9eyFta8oKd6SD/jFgOzaz/A+sAlxVp+spMHZXWyhdVna6NCwHgKK+3Tqkd26BtmSRSmM1TijdNkWyZZtyTIFLpK8abX4/RHwjGJzlY/u9MyKMUAzoQa/pzBVhZPSswfuqjA== 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=aquKw18N2wJA1njWXpQP5FuxitXcW2N0y3/KznXXdH4=; b=at8OPxqnp6/dX3dXhZO8uFatrR0Pz/QhtCFoKt+8EnDqnAWidZIaSwHIWjkwWrQgE8xm8p5+QsaaDXwTBVeWjieDyrVn97eTmmW0GxV28VnQFr9rc0KBbOcLLBOaq711XLZZxEHL5jAnYlKcaA23N74oCY7+CShpkttTkApnMsznW4rki2r+SszwcU/ofS32wtLQzpJ8VdXS26Xau2I0sAicdgi5ZUqOkTHHokcshB5UQ5bMvYVjk+1Gu1BFMuM0V/0SSJr2HpjJb5ao/rBWe8MwdgwXFcY7jh5cwxq6IVd4leMSN5sy3eXNaqk9gdoWGffNUu9NbocCNO2uAxIDMg== 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=aquKw18N2wJA1njWXpQP5FuxitXcW2N0y3/KznXXdH4=; b=A9d4vlIUT6z02pLXd2JiGk/bAVduSS+S3b7gOmb6N8tWuo8YO68SBSkBt60c6LiG0HVXanyIvg2UKgIp1eEDlRJivD9+0ZQSA8U3b8TvnL8BquBwLE7yYhpmIS9z9xB+nJz/xQgicq9g2/9G9j7kDHOKg/3Jst43eyacNO2/P4Shkp2TsZCMiN8Ql3shLtiVl7d2ooWBCilERmCkZA38c7ftfk/0zZUfCORU4w6vn6LYd+IDbi7vsKuSWcAudvypHVYfXUJT30WGszxkrrh9E0c4qB0PI5+/AER+NOq8/j1i6aAcZngopG/aPoN0ZkY+DqwYkkw/m8r/pXgUF6AnWw== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4c) by DB8EUR05HT034.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::163) 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:34:38 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc0f::45) by DB8EUR05FT027.mail.protection.outlook.com (2a01:111:e400:fc0f::448) 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:34:38 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:0554568C6EC838773217FAE01A42330DEBCD651DD05B15D03BC1A5BEC8E98FD5; UpperCasedChecksum:5FF173EF0C4BB583639EA9FB82B98385D84E427993B7210399919DFF4BDB0AFE; SizeAsReceived:7777; Count:50 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:34:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:36 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [X2knRm0bUNdAras03P2XFYmnTqqZYHgQ] 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-46-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:34:25 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 9852035e-bb85-4600-ae89-08d930561c92 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n54hrFV+Pl7TTCM1osBJJoYbKZ+kgnMjWPE2uCufivMiW6/2Ctc1g/T2x1ioi89Vq8CPGsJABq4UGJ8VZFiw3Bogr5qTouTnA8XGm1HaZzxHuq/J2wkunudrKj7i2Hf8CQNvMncioomytSE2paNANcadl8Sq7i1X8CFPZCuhK/r+5l3aeKynRuymRbjqBICTFU3HEYTrdKmlUSSzgMcjkjc2PHeH5Txr1FYhvT+wJT0m10CvJ6JovDVRm38b59FUaPpCnzvf9bGmr7q+ZMV3PAyH7ST1HomDXrvKrulOFbbLSxpYxWYSiCYfV6uCSmbi0Rezu7M5Z/HbOHQPiq0Pf5X1JaI/Iz4FS7zxh6TtJFP4UqbqF9aB9Ba0gBoUdiHxRzimqEQzdTg4rxo3afA+QPIAe8HRgopS4Tmrb+0M1r+6Bw449GbqRAAhmKT5iCf41claSdTlIzHR/SEN10R3jPZBfM0T7MeND7Aoop/+eKTfbj1Kxg68s7lTFVLrhZ9ArItXUwqsSL0LfJlhnIm5SqmXk0L+ZKwfHAzxZesJrWDDsteXm/8zXbHk6EeS1RW2NNZZ8bZzyQIgzKcktLOsZOi1NCSTxyAzdvKxsRBPoP7R4RsFKLqgcnA0lJ+y27xEOk2okzwmI//6LwPmWKpldy5QxY9/rvNTF4POImH34efVYqNzlcFUH263cdYr+uPRUtMkq7FR0iJoo2glP0BpQID/AzRuajaxgo= X-MS-TrafficTypeDiagnostic: DB8EUR05HT034: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FdtXjZ0rfPXxff4AiLRcSdZkvMJby81Wj36FgpRGyvCf+Uu7HDc6zegdxYOx6/LhnD5J17ErRdu79tMn4D3wlffdPowQwgkhi9tdhOVJqAxmqTPw79mAkXK9wJOGIoAZuNl7vOT8qZE9rppsAvwvZz05hBxKtv6E94TPL6vfRuy3SjPLoCyPHgUTf/zHoHernwzi5jhwFKotx3d0b/AM/AEro3teDAoazVWi3rMTmLEy4f1QIz+O62Ze2gMwZB1E5qdhP3vgNK4XqFKBjyocegKBraBnHP8TLwTuWtCSCqwafH7EqYq05Pd2RRx92ZS5nw7ujgFrFFCqFbmqax2PI7LjCos3dPjsTEby6cJctlLjBsuPC2cc0ismUUxPpBpVLnoz2tgMYs5l0DLaLcErvQ== X-MS-Exchange-AntiSpam-MessageData: jXgrBCwuDoRV3OiYzUnmy60CIu6vxx3Mq+nCGEIZUi4yt6loy/wLkp4ghUSb62dpaDre2fAzRZL8hKRQrf2aNJ54KAU3T9p3KFLBaw60aLjPpDSzREv9n1sPysMLcJsyUKUzNgM9G0fcsP35xpSjuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9852035e-bb85-4600-ae89-08d930561c92 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:25.7210 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT027.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: DB8EUR05HT034 Subject: [FFmpeg-devel] [PATCH 47/54] avformat/tedcaptionsdec: 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: Q7L/jZA8szQn by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/tedcaptionsdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/tedcaptionsdec.c b/libavformat/tedcaptionsdec.c index 8bebaba5c0..4bf93e26e2 100644 --- a/libavformat/tedcaptionsdec.c +++ b/libavformat/tedcaptionsdec.c @@ -288,7 +288,6 @@ static av_cold int tedcaptions_read_header(AVFormatContext *avf) if (ret == AVERROR_INVALIDDATA) av_log(avf, AV_LOG_ERROR, "Syntax error near offset %"PRId64".\n", avio_tell(avf->pb)); - ff_subtitles_queue_clean(&tc->subs); return ret; } ff_subtitles_queue_finalize(avf, &tc->subs); @@ -358,6 +357,7 @@ const AVInputFormat ff_tedcaptions_demuxer = { .name = "tedcaptions", .long_name = NULL_IF_CONFIG_SMALL("TED Talks captions"), .priv_data_size = sizeof(TEDCaptionsDemuxer), + .flags_internal = FF_FMT_INIT_CLEANUP, .priv_class = &tedcaptions_demuxer_class, .read_header = tedcaptions_read_header, .read_packet = tedcaptions_read_packet,