From patchwork Tue Jun 15 23:32:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28348 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4313787iol; Tue, 15 Jun 2021 16:38:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4DkFC+IloFbN8znCNz6IT18YBt0qH3wyIARBOmwaTxkBl7L3h8SXCwPYwRFrTzpjQWG9H X-Received: by 2002:a17:906:fcaa:: with SMTP id qw10mr2027260ejb.233.1623800336474; Tue, 15 Jun 2021 16:38:56 -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 kl18si510467ejc.160.2021.06.15.16.38.56; Tue, 15 Jun 2021 16:38:56 -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=aJfrn3Y+; 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 12B4868A062; Wed, 16 Jun 2021 02:34:41 +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-vi1eur05olkn2097.outbound.protection.outlook.com [40.92.90.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D201689F00 for ; Wed, 16 Jun 2021 02:34:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PGQUprXvRLyAGCYwECVG5zE8kUD2z1aKfgDC9DKLHfXxPHDVfa8cXj031CS0YvpORdSXepSUtwbKOL958T+sbb2S2X3kJtmik1f/RTbhLhZdcmmMk34jKzfwfOPU6uSRAS/+52rl+bOccgfvDanP9ri8LdkAdbVHMPMIauIa8TlKGsnm4gkYu80KLwDUiNTSrlANGrqf4r9+YlOkfuvYXVwfplhkaaTw+wbjhYghtoJEzBOfu9siHE+YEadQerOs2781tRzg4Rvdk6JYQjyuVWP+XnuadfbHEk2MkQgLkw0tRbSFI1O5neEwsbtwhSYL/0M5h8NgPF8c8yLEtJI9FQ== 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=vGawsJK3JfC9wI2NxMvS1ERdU9cg2yGQqvnyGxr1diQ=; b=UpCQmrxuIszVkSCONbMqvweRgA9vvu0k56jmPWxX1ciVgP1wSoLE0u7S+u9ZETDYTmCdO5X4xRq9gQ7h70IEek7MWv0YPwps9+P3+LjMNSgKtyUjAqts+3zIGFds/mO/ACAPYjh7Mg83s+ABCnkGq5Y7e2B3GvbqKh7XSazwQrMCgRnKlLeI8nyv8z36pTHZAtK3QT53YuxTuK9M6qo7hWF5IZKM0H49G5DVJWZdYS6IHuJvaaFc/yj0MAhOOkzK0eJfYXSX9IyNEhwGJXb0d7CU67ByXYni0v6DxNIrApelgyFLN/w/bYTr6tscBTWpyyI3oDzFwkB00nRYqY2yew== 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=vGawsJK3JfC9wI2NxMvS1ERdU9cg2yGQqvnyGxr1diQ=; b=aJfrn3Y+vqVsEV0ZNXrmCmRmVJX5IvJLdfm735ZAETm1yXSw61WfjIOs3LT6Huapbp9l51YdH3d3Zv1pNSeWv5kjuZhzhJURDJ0OS56d8AO4+IXgk1jT4R2otmnWDP0klLMd/jcuKKRL8A3dg/0sSEZjniXmsgV/JYuwvCqU1x/ESpeNmy1q3ooX4R4Pm+qvPgmFUD6OdJDvb3dD/UgNt5xim7BnZRhUSPqBeYq+Gd2nzkFN+c1DOxwAzDXvfdhn+sBdb7ypd0TAorARn1r6jliIM+qCpOOTj7ecXu64xOl1YKV88z/5vsLhfFC/ItezQK4S89SOb/sGlk9/Vo/Gfw== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::46) by DB8EUR05HT010.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::419) 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:34 +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:34:34 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:05A867DFDAD8869ADA1258B48354631F4F1903310E47F97071EB63CA029C7D3F; UpperCasedChecksum:6A0F4245FF561A18F9B54FE6E5EEBC8CA4D7C8DF11535E11F64315E7F34E15D6; SizeAsReceived:7770; 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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:28 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [DzAnsfW7kaX3hHxtT0NVtLeZVNxaoYFu] 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-38-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:10 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 80901e4e-3b21-4ba3-cf60-08d930561398 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n54hrFV+Pl7TQFddBShjFbyiRmNX1GQTvLRu8EE1jVJYzjMkHm/NT0QYplQCmhwZuFc1sAqLB6dKBv8HsNDNCxcmFyg1rmbw3DRo+deVIKIKG3nZlC5pHTWaTIMlk4ANqQ7oPwM2AdQIxrhrsT5Artx0MjpoTqeFXwqfM0cJbC0cUeMlQ4KZe31kJUWwUzp4ydeK+qKgb7NUMq/mdL1KVeW6FD9ekD/U0h5i3cMlrS3fNfg/rBdNidbXMqUQOpd4pOpLkdmad+usyctFjA/escScwQ/IVkvsQLESnmn7/2rkxGX1s3+d98UsM8FS9VskPdnwuZurp0AFsDom+baRvcuncaoA6S/v9M8VgxNSp8C/HSn/wlJzh7zilMkH8CzASjbsc6QAw15CRszYo9EK8qIju9Jbds7JnrYsoeR78ahoamI6GjNlpRbqSEJvRsg/Cnyc7PBZtt7yHA40jKgTl+5IFcV8XNNnYcbbfMqRVGM6DlFNgVjHGp/YHDNI7FY+uKsnLtL7zFlnpsggIKAPrDzCyBjSfr3ykSui0qD8c4pWyLqIM4fC1q9OelbAkeIEKb9g/QebsMKNURj9APRSnsY8EOxkWy5qQagv8MmYDMWb6J1XH6UXxTraXvQlZEmqLjq0ypUSus2rMf+r/Z7VX2QgDQQOyfBoNEcuo2ErWLz/jqqLe9y39myV2EZqdXSo/VlDXWH/fljedZqmCj6TfwCUzLI34m3/BY= X-MS-TrafficTypeDiagnostic: DB8EUR05HT010: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uEMy0NLGdO4oMAO/EwQLqgmeaXTM7QjidAPlkEiEiEsdpNSkTFRELy95sGPZybpBlB/IeNcBeAvZbWEco7LiBRO+M8GHo4FgLrAK7qN4DOHXYtYlxHO/hEi/CFJ7IhcT+DKRLubmWmCrgXmVQo87i/kZ319+i3+7JhCeEVF4qoKJv+XlgEOxtarw96o78I7J/nDxZ+cFluSxgzDDWAd17Q3pcMOdbT/fsII4CVOm87+fQmsOpe82t4fC1BdaB3J1gQZN1m9BDpzc1Df2zCoNza7vXgDhAycL8G6p9pF+OCwqdNOb/EUA3H7y8UGz9T1wJDa7y8BABajg0Lb/5vaRqurqoUJw7zir7oTox6CK0IyOZh5QqInevoBkBuLfPrua6hFf21pXSiMU4OMUW4svWg== X-MS-Exchange-AntiSpam-MessageData: omwABu6N9k/7Z+ea0p9YO9kUY0HFTjgipeAd7izSeY8ELB4ayFo7G+ZyBas06y5TqmgGd0UjB0NF1fwf4/vRzmPqmhrBdN2GVEie4mGMtEQP7YUbmHGBOwmUV5CTesJlYkwG0LpbZTQmB+Nlus3ZPA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80901e4e-3b21-4ba3-cf60-08d930561398 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:10.6566 (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: DB8EUR05HT010 Subject: [FFmpeg-devel] [PATCH 39/54] avformat/samidec: 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: sCb2001fyPaj by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/samidec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/samidec.c b/libavformat/samidec.c index 8f97cb7331..c23335cf4d 100644 --- a/libavformat/samidec.c +++ b/libavformat/samidec.c @@ -115,8 +115,6 @@ static int sami_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &sami->q); end: - if (res < 0) - ff_subtitles_queue_clean(&sami->q); av_bprint_finalize(&buf, NULL); return res; } @@ -146,6 +144,7 @@ const AVInputFormat ff_sami_demuxer = { .name = "sami", .long_name = NULL_IF_CONFIG_SMALL("SAMI subtitle format"), .priv_data_size = sizeof(SAMIContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = sami_probe, .read_header = sami_read_header, .read_packet = sami_read_packet,