From patchwork Tue Jun 15 23:32:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28350 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4314883iol; Tue, 15 Jun 2021 16:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw30jzLvHr7JQe7/wXQ7npNPOxo8WPurU35UyQEKZnkZYfHV9dmCXOSirYtWfQLDpyHYi2o X-Received: by 2002:a05:6402:40cc:: with SMTP id z12mr714757edb.202.1623800443551; Tue, 15 Jun 2021 16:40:43 -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 cq9si277147edb.321.2021.06.15.16.40.43; Tue, 15 Jun 2021 16:40:43 -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=CZ0ry2IZ; 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 769DF68A16A; Wed, 16 Jun 2021 02:34:52 +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-vi1eur05olkn2105.outbound.protection.outlook.com [40.92.90.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31283689FE2 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=U1Cl8dFgxKaJ5uDQfwLDMteFRqpL6IxSot0/wt4CgbdnRP709SYE5DTSee2cYlu4b70ZNe+qEcurhPVf5pm5LZTFfqiwbEvZKCKLxYF6GhFUmwliSifDT4l3towYwrV01g4L/wRmgR3MmAAkqp/CyUlmrCe6q/RXzp/ceVf5OeVwIz2FemsWvmrVG6ld3G7b4J57jyAjD5sk96A1oo0VhRNcMrEqOG0/fANTqJJU3QvFnzH+U9z/keNbEeWjkfsTXCFTKVcbyS6biswqCbC2J7YnbpgscOaoSmrPAE/IIovx2CCcFk9NpAOaJV9NevD0qfNN/fjqTBD2Md3BS9eC9g== 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=QumfqLwM14d9VFZKeFPXiy5QAhisxsyBUkkXZPNd12k=; b=Wdt5I+KmuWUsUqI3/tywdSnd2JGMBE4Q6yNn/llZ8lhhbRxUD12ChqZvptkJKPWkxfhWvp30SryiRlDxgFR5KcaoRC5DwX9vFAI/dwM7YIUN3qMK76s1dWLjrHgxPD9iv3BmBuBcze6pOrfarY3LyV0Z3qhZIuciglBrf3MwOambg35+ayday/233trgg6d6YtR0nyFNThyhEt8uA7bM1MNA77NCG77Ah+jtq97GIWXmObEQmEi3VwONvXLjSnk8yeCLoVb5Oyrle8wGKjTX++8iPhNJHDMtKNQHtFnNhIj0lgN0Vn2akdEuY1ixSLZZNpYd1OzETcWK5IC6K5JIYg== 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=QumfqLwM14d9VFZKeFPXiy5QAhisxsyBUkkXZPNd12k=; b=CZ0ry2IZ5V/K2DFbJ3L+2WKsahT90zFo0T7N+ISFDfrg3Lmkl27KqDMY5IswsaLe+t5rSRFeeFeuTpERYAZsG/klShQ5LV31yxDTErgrxE2wNddcGilHT5qNOawkOgQfWj09qEAiynBrqUjsPgEqLMl/HkNPAagXPr2mlpEz0I8lJWA9wFPiPlmqAiZ/ElpyQdeqFVmONQJaD6fjsXc7koKwrjwugqWol2hZxr22REz55ntgTD5rvKgYiANjkpLB/Lp0wsNxiQT9lDJ+RfXzVzJq+e8QdLE5vvr7PpkMPTG/TPhIkydpysZtVwg6A+Ks944ZkPpPdnoqdM2fxVgIxA== Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05HT210.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::437) 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:40 +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:40 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D81B900FCBB7EB78D9ACEB343C6389D792C3E257B398DDBB2F63EAD3614A747A; UpperCasedChecksum:299943CA92BFF0BAE7EBCA9A4A73EF10A9184FE39AF59A720BCE4CB71BFD185A; SizeAsReceived:7772; 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:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:40 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [HAdgWo4biMvl+KgYvQ2d4E28Io5CdbaN] 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-50-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:30 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d4dc6c69-7300-4a86-effe-08d930561fbd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n4p9PDP/HNk3ln2w0Uxj9nx+fAXJuGNw5Iy65FUPojR+i1HmmkkQq2tGO1mSPuKKQGkH6W2OrWyQwX0HFlapQ6yjxgaYEf7XJwshpGgaUrc5FtpcRMEDShpmPv8mZc3Ul313Gjk+tZ5pK7GmBt3w5MoZGOCMnDRJiJHQOf7OZx1pnTGevxqjQ7XR/LEJlIpvRU9L0J9ZN0R5q2mePaJCT8d2M931LQB3s7RtJdDL6cVFe5Jbhzf+fYuP8RbxSQiOpDOXzwMtRzBoV/wTDaFxy7gvUPppnpWcSLwhdLUqvZW5K/PINMZfmakh8Xbgxb/T38dVuDzxuejkFwTYHcCX4ykkOoCjl52M0kXdHco4MttFfKRbjuQucOUCcWTtfD4Wt2ZQ84O3e9wMaaiFOflfmou4c5AU9ZzCekkpLj12Oz4I3lLOSQEWEjME3wOBEoF6XeoajRCJN92ayWinvlOkEvCFcL/3jQ+ayIslHCW//jrN2rWD4gieiuFLyqfBECuO21BCJMnzZjCIhZcKaxy98YPqbN6lktC0Qar1sK+NjbRxUlI5nB8HR9SD2m1qtgsXXnBQ2AcuLnZCuWcG/1nDRdOVj577IawMAnwGV3F50+1vSw/U4DHhYOMiYR86PFOCWyidgaapKz5LF4FEKACCNNhNds6qcm0NEiO8FYtrDDDkvhNiyWEaS7q7OY0tqzL3xwAELOsej/h6yPWxeMenbj9sv9x6grB/f4= X-MS-TrafficTypeDiagnostic: DB8EUR05HT210: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wyxTxFUgrWc1UiV+RySyhWCcA+8m4WUM13gNLLw3TwGkW9m0xRBEw898VX62jUrSpFp3JLXk8zxBTwkA1gAj4FwzLKd9J/xajSiBXTGbawjYFEuhGcZzn1TqcJrZ/1MMH2CS3VmQEUNdhHbCpo3oRyu8HliVPHay2PtI9r90ztyNC+m3y8KnyBQ8k1TkK16IVgCTDajvnrn0WBeNBmV/OzQS3JRKPiQf1occT7tQ5OqQ9BZIiSQHKBeSLS99EvLMWNccOFkW9nPyWWByxXoy44Wm6Otajx0V7PaBzFIPD2rkQpc1tQ29LVuQAS7EySg81qRXUqwv9k8aY9YzN21O0mt6E5tnT0D4ll403a2biavUO8jRfpFEvRSMJv6jZXKNJOu6/AEzYAnw7AYq1p4Qjg== X-MS-Exchange-AntiSpam-MessageData: HUoWGn5vQEc398gswWkhq6zhRdLzMPM4gDmc0riLywm8XYCyzpuBEQpQqkr5yKPYBuK72TgtMIfT/zVSl+gDSq5rzb0i5nqR8AiSKCuOtBxozb0+yFYQVqaRtbwbLveZR/42moe5gxYUgjQ+5pr84w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4dc6c69-7300-4a86-effe-08d930561fbd X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:31.0286 (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: DB8EUR05HT210 Subject: [FFmpeg-devel] [PATCH 51/54] avformat/vplayerdec: 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: sDyb4cQhXVRf by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/vplayerdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/vplayerdec.c b/libavformat/vplayerdec.c index f6c2b35ea7..8c9ff81163 100644 --- a/libavformat/vplayerdec.c +++ b/libavformat/vplayerdec.c @@ -83,10 +83,8 @@ static int vplayer_read_header(AVFormatContext *s) AVPacket *sub; sub = ff_subtitles_queue_insert(&vplayer->q, p, strlen(p), 0); - if (!sub) { - ff_subtitles_queue_clean(&vplayer->q); + if (!sub) return AVERROR(ENOMEM); - } sub->pos = pos; sub->pts = pts_start; sub->duration = -1; @@ -122,6 +120,7 @@ const AVInputFormat ff_vplayer_demuxer = { .name = "vplayer", .long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitles"), .priv_data_size = sizeof(VPlayerContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = vplayer_probe, .read_header = vplayer_read_header, .read_packet = vplayer_read_packet,