From patchwork Tue Jun 15 23:32:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28420 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp126460ybk; Tue, 15 Jun 2021 16:39:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwgAr1iR9/29RM6O9CUUoISpCfSjrkQaGtCSBV8JbUx4y/+VPR2Unmw01Qd/va4fIXd3wS X-Received: by 2002:a05:6402:254d:: with SMTP id l13mr716928edb.286.1623800398102; Tue, 15 Jun 2021 16:39:58 -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 23si478099ejg.6.2021.06.15.16.39.57; Tue, 15 Jun 2021 16:39:58 -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=AsjTX0nd; 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 E71F868A107; Wed, 16 Jun 2021 02:34:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2041.outbound.protection.outlook.com [40.92.90.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3532B68804C for ; Wed, 16 Jun 2021 02:34:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ODNz6/9kVP+rP/XVm54jKsvy4FvAhCYyjiaXcekrx6uaiiSCleZ2PSw5P1hJ2nXxkrwWTAO6bZ+r0meORrdlZCnU8lJHY98NNfa42DntoCU8vI6UXeES35UkEGzdduZb6+6f2yvdv1IOmx6OKYCWy/ZxaQPXCtDZYptLv7oWcn4j+0ut/R5UQYQiD3lXtT1M4n5qRRa1ha7pRYDQ5xC8PZR71j8Jv1Z2gqIUxpqXf3mYbYyCFJ480HB/rbbUTRBXGensRIBHfyL1wkhuwIzJ7h+j3ne3WPFYmNeW6sIJQk5+REkJysXpzjmgzHaqQpPYZUm+d8xSusDL+VO6c0Iy3w== 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=j61KLlIrBi5yhxyc/CO8/i+33EDe7l3vracCRU/Abs8=; b=MCxlYyNCgyBwi0Hrarmx10TTQfsxCaSLaly1vJQBxdJFwASy0fEKlVVX3OjSI50wRpyP6gZI2xWKKuznXavbwAxU9Qf5frfsHNXwHqpXZwtDDFIgjy2xGtp94ufn6Ldc2G3bgi1cp1oP17d/VkYMLhSDhB7/O9jB8SVjUNgA+kvdONcEvUM9XGJKNZ7PTxKrPfRXZjJ63a/1yxVJwKlaaAh18XruTKWT+giqIHGuyFky2R19/P/3VTvZehBWflHQ3vCNKdJ8ztu+YuZVkha0LFnEJAli/TjiNxZqYp4SSi+2cFJaB+jJEY35K5tVbyU+JxUmg8PmAZLd13agNLYO8g== 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=j61KLlIrBi5yhxyc/CO8/i+33EDe7l3vracCRU/Abs8=; b=AsjTX0nd4EvW/B5Lbla0GhDjvz2JhXuIdUpTWlV/UlT+KORoiyQtZSMimuuCrOK+71F4I+T/6dfX2WqLAOufoiPojHJtvrlO9Lc3U1r17ih4YuxA8N1YRe8Qp6FFGAUGbNkapLsJQP1IyW50ShcucHudqCUxNsDqYutIRi4pFkhpK5nW9ZRXPHD+4VnCHemP92l/ynnu6f/cCQaLfY1Z1Qurj7gCC2/HA0QAX/3GYMmXnV389fBS3/8Wyu46mP+JpZVmXiDaOOCt93Y3uWLLV5Jt51xk+1hxpFvtWn+morID4vOciDNsnsIHOG5qa9hzFcbd7rCLilYWrsNBjwPkQQ== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::50) by DB8EUR05HT019.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::421) 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:5A2E43836556D6FAA9BE58FE4749D112442607938E06F62F25C809E182828E31; UpperCasedChecksum:7C5DB10618E61137D8E13D367EA10CEC0EC910DF2FCEAE398DCB4EB9BF278C3F; SizeAsReceived:7775; 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:35 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Zun1AnLkfXjv/HhJsy2TakiIaX9KMyp/] 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-45-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:23 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: dffa4f6e-3fdd-4c99-8e79-08d930561bd5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n54hrFV+Pl7TUq1YDfqDj3Iky3SuQbnz3lAiEw+LWe/PlmSnQAK1igPeSheVbrKmvI6fDRRw78rwyFj10PaQDvsWKx1+fcfAAYvM39xQzy+6RMliwlNtoLUwtcoC/tsU9wPkGGNSSOhx8p/H8JFy4h4Kk/cY73O+/OGb6sq9N1FtVAvqVksqNRBWOu9/U80sNV4Yv5Apx5kG6q4Iyan1hYC7u89P8lndkS0sPeofWXWrpfvkMkzcfytg6GyMZZe054qu9Z/DBmxUtNc7ygeJ9qFkplr1iI3WK3aZaDsPizp5PRQ1AuIKbTFK6D8d7GwcePJziRrp8EiH6xJ1xH7r3ad7ru4PSzY8wSNOGk0G3xihm21AvFH/khjzl1gf778wJ2jfwaiC6KXajtoZRuGmKHP3KerMwCVdeRdlDm0i+GOlIpOwQVxfOAtRH/rem7AVKUQQAcUACXGcwobRus7yXEDuFoCTjDddsYwpQcDKJT+9KdYeEjYRT8DdeNHLn7Hm3NtguRmkt2oo83X0tUH5kdkoas/SQRuUMjsqoZlRhcL/Eu4R/5KzYbAhJzpnYr656lH453nLtUkwEdPY2Dydo0IOqohlRrB6/yyC+UPwjte9CWTEd51Q9Zhl9sYvPBwsxAOriHZ07e+rO6jtpZE320H1I6KiUJX1228a26r+Hbh4WtmCShfC3iewKQwZCb/w1p9J7pJEkoOQcHQpGEvyCIVmZkluDANmOM= X-MS-TrafficTypeDiagnostic: DB8EUR05HT019: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J64FKd6H5YFhbhcAbu6ClEXKfHxMPuu0D3KgXJsDlddXxcDTxjS7gX3t6SAyk3/0veIcAUlD3AWT4FClimGYYH5ArGmyGW8SdmfKdcGKha+E3B7ku79KfpkatC0JMT+kR4zI+kxw0rjBZ6ff1d02DBWMAseh/mBGLUuXwQO3wkap1hp0pxlMJK1LvsChvy0jh3AjjgZcrFeuXzH/cGObv5JQnlYfLW3cKpOowsMA9/i1Dj30H5UR1GdPmicpdnibpX0h0ytrmw8dYo2Kxtg08yELPAKCNqPykiJoFZvPjBMr4A5844FkqUxJnim6JfEQwuTnvLS3eAZjK7RPlui1+8jqqzCJFbcD6+vVkwJk/qY3nW/lJn6dISDRMQKKYep72Z1FB5n1EmwSXhtGQPgQow== X-MS-Exchange-AntiSpam-MessageData: 2mfT7IEuh7f2sFFTbHt2QgRBpqmPzAPc1xdr3WEzCZeT0d0ZsXKeY+SS8AxNtIiIyefzWON6WsG8vMAnjLf4a9YxQKr1tkC030l9HSNzYGtfh7GZS7i1QS3pvlcMH8Vn5CKIjxkv6QUpwiUwBTHo1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dffa4f6e-3fdd-4c99-8e79-08d930561bd5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:24.4006 (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: DB8EUR05HT019 Subject: [FFmpeg-devel] [PATCH 46/54] avformat/subviewer1dec: 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: s/NTavCohkHb Content-Length: 1575 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/subviewer1dec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/subviewer1dec.c b/libavformat/subviewer1dec.c index d1ba99f984..f1267031f8 100644 --- a/libavformat/subviewer1dec.c +++ b/libavformat/subviewer1dec.c @@ -77,10 +77,8 @@ static int subviewer1_read_header(AVFormatContext *s) sub->duration = pts_start - sub->pts; } else { sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0); - if (!sub) { - ff_subtitles_queue_clean(&subviewer1->q); + if (!sub) return AVERROR(ENOMEM); - } sub->pos = pos; sub->pts = pts_start; sub->duration = -1; @@ -117,6 +115,7 @@ const AVInputFormat ff_subviewer1_demuxer = { .name = "subviewer1", .long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle format"), .priv_data_size = sizeof(SubViewer1Context), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = subviewer1_probe, .read_header = subviewer1_read_header, .read_packet = subviewer1_read_packet,