From patchwork Tue Jun 15 23:32:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28366 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp126159ybk; Tue, 15 Jun 2021 16:39:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaD652iQZLrizi0pQAJnp/OZvQJEfTwdCgLi3XjXet6XWnvXwv+RfZ+Pit/x5II9t0oJTY X-Received: by 2002:a17:906:3b4d:: with SMTP id h13mr2023562ejf.228.1623800368461; Tue, 15 Jun 2021 16:39:28 -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 ha1si398337ejb.743.2021.06.15.16.39.28; Tue, 15 Jun 2021 16:39:28 -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="l8Bn/Hn8"; 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 BC96B68A02F; Wed, 16 Jun 2021 02:34:44 +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-am6eur05olkn2031.outbound.protection.outlook.com [40.92.91.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB9D4689F4F for ; Wed, 16 Jun 2021 02:34:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WQXLeAtcgY84KJKYT04ZF38mafUCBSQBXOeKwG3XGWA5VrGHPywKF5ONTY1k08lBf6elvzCIeA/Zsj5kB1f6ghZ5n1pTVYc78Q4UBKhrAfQD1mpY9Bv4MB7OtJTarCMOiX/0Eh4ShL15CSO+swU0x4obZNZMjtk519q9eiAH0erURjhsNODYelY6qQ8sqLTtoAq6CKOJYUTzW2oGfX1ct356Wyb0sE7X6u80VDkTkuC8vuPavmZjuG3ihqWuuaYdEC7p1i2WSVtleR7wPdqLsJs48UVo3vVW1edzkJOXo5sPxw89NzUpIX4xVOt96QbhlEz+IxGrC54RD1SaKMR1SA== 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=HlIeWZxueTT4G12DHFCqWmMekv2+dhH3nrph4+Guz0Q=; b=AFc0QuLSesIdooNfGXHJguSTSPFebijqWiki9XVwwP6wA3sqEq2B4mq3pdfZCJCMf+sc49lZxM+FF8RyVMBnFJY5rXyYmIx7kz2LYrz5TdPjInQwWOlDhs3EGx7rqxI40dVYp0wZtbA+qUXGrqMvX0KWIBuXF53rTKDtukgxIl3LarI+cEokuaYtYbbM8co7+IMUe1x5SB5F0mzahhyfe0DrhhrWY/WgJCPTa4g7TsKFaQWQmQnEiXZTeI1pCggndr3qXuuo4wp3a5EF2Al8/tvJjmSLHf8ddkKtOgMvoVJixFghe+uJccw3UZUVA6zXd/m+6IsVUvlyl6quRQ1/qg== 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=HlIeWZxueTT4G12DHFCqWmMekv2+dhH3nrph4+Guz0Q=; b=l8Bn/Hn8x4djHhE69CaFmd6C8vuQc8w3ZXohGK/5nhhVy71YnqkTHs/vPYagmF9NFIwnhYvELRRPU78Z5IFGCZroAvnyzcV4jHW0nBysCtwBWkySqw2Xav07CZiFqWWRDqrhAEHaF8FVW/c7LRZ4/9RGqly2RVwRHjnF4li2dQz/7zbTpCY6/jteqrOMXdDqubwwkg+uP+4eCssENIOcTHtwoK2D8oOa8HMdsy8uGja/SfuTzbuJPvVvguf2IJUngOf9CVsrZqnw9t9DmVRRndPmaVfEPiG/jk22I09vG8iVI1AUKTP3Ej0XJtsoW6Frf0TEPLv6LGSQ6L6TJLMHUQ== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4f) by DB8EUR05HT026.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::75) 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:36 +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:36 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:46307E50B173965067D54F2F4AA6106B5B5E74D8C8C0561220C5894AD8CD1A41; UpperCasedChecksum:2F1273CDAD233F72307240AF083F7CF6AABEC2D42024F73A57C8DF03E54DB3CB; SizeAsReceived:7769; 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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:32 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [rd6nSYNTIgyb6NFXdCY4FjXOTBOWMo7T] 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-42-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:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ebabc3d5-be8b-4439-a5e4-08d93056169b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk9mLI+N6jfyjHWo1aLjbeJG67fro0emgnUgqow8NqHpcVd9JiObgJA6STh7Li4C5DRc27+dTpImkAS10U8fdzl1AxLHViHYLkG1Ni8UuO/PxDOFO4PQZwCbmesiOH8hLrHJYeWwXo8nKxcS6PZ6yaz+V+DxBvSfiuqcAntzCx+hdWBRHh2arfR0H+IcaifkHsIGfVGmwRr6h5G7rCzOEt1DD1L2/Jwjdb1USPiFzg6cFSYkeyUNjxYFg0E15H+p9y3JhTS403xihd5KzBVUFuK46kqbAJISOvmxlXoGCBi5wmrbJhseQl7OedO9U51HDowHi0TvWdsnBabVba7z9tQUtEFpidteTFqBaeBvAFdxngbQfZlfyG4ZVderbupKrIzIrh5zRNeiIlNeoqK3RJxXV/Ar9hGihXDciemCcFiSrLn0HBRN4XTB/99kaInvl0uUiNRIIk8JgJVfy+kwlqF6KBujMK4z13TT3fCa9xdu3Qqw062qDspbSgjAajEVrM9xg4EexAAviZH5YM1bFvxdwu8cPlaU0X88eR5nOOaKc5oZI6tM1gxLdVyDBmOfCfPcMLbHJnmY1KjgTX1WpYRkA1aBG5wi/YhJXdK4EI3EEgCxe3OmP7kgvsKBte86ntvRB2zquHVoR+2iNFc0MPFgUSyadSnDWtBE1tG49i5/w9aAWF5AEmQRtP9hU523fKF9jpv+aB+JHGq9PuGjjfkwyQJre0ITN20= X-MS-TrafficTypeDiagnostic: DB8EUR05HT026: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h/JAqW6h7X8k4UWBIMcDwWm7sVQY82hZsad6zavyGY6Wt6sVZ4P2WRLJ297qaeHyhLDCOVOqld6QAdaXMnEN/9UOexjXiLz7W6//yo5f87JEWxXyZPYzbZ3ToB2eHYOIJoq1brMYuI1/EuS7nn7Oic+dmcVmJzwZui/N8nWGC8UrcJvgE1d0R3owpyUwb0BLHoBOurqxp3gnOv9c3cHZwh0XNkxSthMUzgO/pd1z1JOCYjGGz5dT7yYP+LfmN+KaUNitYiD4U/WP2A0F0J/lJ0qlCnXPAvbygZO8logCUnaLalmcLPtMN8qHoF/YkXGp5lDCCvLCUEHJswIhVuP1dWFNuseHCe6vtY3VV9Zw7qwZT4+ckq8ihpvZv1UdTKMoHC4aTWZrf2XjoJsnMOqInw== X-MS-Exchange-AntiSpam-MessageData: qmXkoK5qJYdxA9Ji5uFNYI3n9aNNONzpYm6nV+o3MPr/LNsy083xgiX10tnUjDT/7YcPuYL4Mp8yDVIYkSUJilXNL1QEt4Hrs3ffH11zFw81+3yIjYjnPg4gqsZLQ5hAkmvkTiZNLMoFyRF3A9wOVg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebabc3d5-be8b-4439-a5e4-08d93056169b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:15.6994 (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: DB8EUR05HT026 Subject: [FFmpeg-devel] [PATCH 43/54] avformat/srtdec: 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: f8UnDLyx2KGW Content-Length: 1181 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/srtdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index fa52b85566..2f8a677b9f 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -207,8 +207,6 @@ static int srt_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &srt->q); end: - if (res < 0) - ff_subtitles_queue_clean(&srt->q); av_bprint_finalize(&buf, NULL); return res; } @@ -238,6 +236,7 @@ const AVInputFormat ff_srt_demuxer = { .name = "srt", .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), .priv_data_size = sizeof(SRTContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = srt_probe, .read_header = srt_read_header, .read_packet = srt_read_packet,