From patchwork Tue Jun 15 23:32:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4315089iol; Tue, 15 Jun 2021 16:41:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0zj7tpHw1syFBrtG814nQUYSt2uXSqGTt+bjvOm+kM1rmL5J6/CQgfrXVujL9Y6pSHzf9 X-Received: by 2002:aa7:cf0d:: with SMTP id a13mr708971edy.384.1623800461047; Tue, 15 Jun 2021 16:41:01 -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 e16si299376edy.219.2021.06.15.16.41.00; Tue, 15 Jun 2021 16:41:01 -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=F6TlVYs+; 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 68B7168A1AB; Wed, 16 Jun 2021 02:34:54 +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-am6eur05olkn2024.outbound.protection.outlook.com [40.92.91.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE43E689810 for ; Wed, 16 Jun 2021 02:34:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ieVGR62WnmCSQEBkh49KHwGutyV8OXb5dWz7THhMgEJZFTUDfCATiS6crkmpIJIfudKsFz9uAX+YJcqdQr8OQntm6fz6xMWT9vGyxiUYiF80Rz39lqaUPjyekfBDR0fNfkBeNeJXsogfkuDcqaEQYRzAu6JTAs7moOwk1V9kJH51Z7YYHVO1qSJhdgvhr1LoFbO12MXgs5HgCYS9AmeBSe6lSJTCp6fS+8RutdfRjvOEEkbxKuJecZTl8BWG5LCERlrOfGpFE1EsPpstW+zdlb40gSe5vtBpjits1Fv2EOJPLPgQGy584PDOOkx9c7eRl+Sp8L4OlsbmEBdYJIOfuw== 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=6BGNETBjJfaNTpMtEpg0Q5eQl/By2y8IJy8IJpId7dI=; b=FwOGzpAzQVH4wrhz/YGe9CaScxBKYVv0lVJt7yltikzJx7o0LSHqKzmTLnkTBTCG8LLIYpv+AcZlSzw4sbJl4lvNAt/bevZqY7jB6FvnE9wAN3UpF+3sWc7Ib8x6DhBQnweu+hUf81dU+JqGo27QwG0J0kMgEhbV6qPxjRbEoCf0Q3nb1LRjo3Lot/ID536G3IRdZgRixUe1FdqQX84G0ZyC7UB9oyRf1brtWfxfdYs5dmHA8G55RzbHaKwaSKc6RNPnWf9afnPqI8qgk5J+8bvmMH44Ehd8pQJMps2RRUjlWDBgopEf+sAeHEx6CxAtz3Szr4bFd4kiPWQ0/Yi+hg== 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=6BGNETBjJfaNTpMtEpg0Q5eQl/By2y8IJy8IJpId7dI=; b=F6TlVYs+wpj4iFrHEmEvN2CQm425VTlGqCqm6hTAGwyRc+8kYk4hSBqdZZX28O+hoRXe/ZavRmpIDROhWKlJaFxyJNxSTG17yHmhp2y93k9E1ud/HqGtAwYUainLLBpPhjMOTghxaMEjRGO3DlLs36OEsNZ24j2NSqNZ07Db2uIgI3yU7QmkkBX1QcWbNP8tfWFvWNNZ14FoKarGEGzcMz+IVApwFXh/dTOxSiB99Tpa+5z9cfAE7Zo6u8HQ1W/a60B9hVrce4T2KNq94MNTT73vd1zAqzXEuVimPBj+vETt/GRWKgyYWhtshsoVH8kUXn1oX1ZhuvRgEMPUZpSxBw== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::4b) by DB8EUR05HT068.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::259) 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:41 +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:41 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:38C9D27B7948784C1CFB57DABAADC792C25C350709528BFCA2C9A9510DB5794F; UpperCasedChecksum:DC89729C6ECB6C80E38230A8DFCCA9F237D2101CED9BA4D79EE9FF541B532A6B; SizeAsReceived:7761; 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:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:42 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [pyddE/8DIzJFXys3wT4OLl9O6XZorbZA] 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-52-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:32 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f11338de-c213-4a0b-ae16-08d930562134 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n7ChXvHkTLkizeyqHo+PrbhYdt5/fpTHbSA93BBpItFB8RY3aa56BZ5zSiAeXM9Y1IRe/EzNtbPR5AFrleKGzdp163OsBc9WL+obodUmsFrzg2sRGR76MkIqAXIhbIezhmNeuxKgkqs+GXGUjxzClSNELV8oZiVxVLtiwEsb7vACEFT7DiNRSWjfmPE8t/wzhWPtqhwxDc7/lRSHdcLEgHDk1DdYcjiybr+nDp15tijWSbSaJdtUGJ5aUzkroxGCov7ADV5c/ud8mwtZzFOi8WFg/fef4wmFNU5aOe7rwgcvG+yDC4zk7TZBrU7VMIe0CtQkOvZgj3Uvu1W9WZ2NhHJZi8zTR33BAY3/0cSBtkP5Uv2iJLL2PZdkMIy7YzCBKGYpsygrQCRHi2VlgKo96aLXiusO12oN1pHWQriSle2s/mhjfEe50WgwUdy7Z8fgpLyKb9Itd9LSBQhL3bZ8EOQ9+pmVny7RIrhmtcKULFmNc0joBGhjdoJLo0CHYkYk/PzUoJn7974yhdfWGjrN9/Y9F2UsSne7am0rdx241GNUy8wO3paxOmQjfo+MHYZgb/apNeTIDlhd2JW9pFHNId3S44CElIKPtJeoeW9Rj+3RIEgfB/n6UapHFwk42udQogVK4hjRmxqIb+cxsuAdXqCJC6VCoA5f8xrrR4V8a3E2Oa9DKhXg4UG241x1N6NJeGLkVDFe6g6MMMnBTTvr1hsteJ3ITfeQmo= X-MS-TrafficTypeDiagnostic: DB8EUR05HT068: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LFn/5BEcrAWG3hR2JnIUPQeqVNMmWvI6GNMOABrlamDNBfEvtjYzEqNf5Li4zn6tRtCvaCxL2AaiqM7l7/b0qHmPuSq79MAvJbcilmcYkY1jllMPWT4kXOyJw06XtwFmqA9ifuYrDVqL4DK+LeW7gb6+8Hqr08mOKibMnzqs9f6ZdhzYTPbG93khpWX18Dh92wIOrS/VClKEa36SNcjrkjpTkatvXPPPPWF9M5vEwULYCRgPE1SbYdULLkNaCRmbNY/OFXgvdBLEMZ351f+vwm6aYU/sSaUoVbkSKwooOcoqFcaP1+D63gV9FuVGNu45URJQTHODlsh+HGomzZ4X5oFxO8IStruT2ZyQI2eM3CtL4Vpo1kiAjcWOfhtfZKe//LAkauwsg45nfgFS+hYtYQ== X-MS-Exchange-AntiSpam-MessageData: sa8InZ//DFoVS+a9uY96BKzn8buQku6QJPTq2bl/w/vCdMYwR55KsNdbsmFv00t2nn4zzPaZiHRjRDNJmAqYkWEREuJIbs6K7H8X6Kuyf4NdhbQv/PyTUQe0n6yLTL3oGQa9NI3wXZOtTYvSEuBXAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f11338de-c213-4a0b-ae16-08d930562134 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:33.4915 (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: DB8EUR05HT068 Subject: [FFmpeg-devel] [PATCH 53/54] avformat/webvttdec: 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: BmR+CkABQQnU by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/webvttdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index a4654034ac..52320ba7d1 100644 --- a/libavformat/webvttdec.c +++ b/libavformat/webvttdec.c @@ -164,8 +164,6 @@ static int webvtt_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &webvtt->q); end: - if (res < 0) - ff_subtitles_queue_clean(&webvtt->q); av_bprint_finalize(&cue, NULL); return res; } @@ -214,6 +212,7 @@ const AVInputFormat ff_webvtt_demuxer = { .name = "webvtt", .long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), .priv_data_size = sizeof(WebVTTContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = webvtt_probe, .read_header = webvtt_read_header, .read_packet = webvtt_read_packet,