From patchwork Tue Jun 15 23:32:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28376 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp124396ybk; Tue, 15 Jun 2021 16:36:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSkHRhR2syIstBWwyBIHzAsj+zTPxx6KWZwEjug33uzdNwIYPcIjcSVtRJRqwnxT/pWwDv X-Received: by 2002:a05:6402:31ba:: with SMTP id dj26mr686890edb.71.1623800197921; Tue, 15 Jun 2021 16:36:37 -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 rk21si424612ejb.212.2021.06.15.16.36.37; Tue, 15 Jun 2021 16:36:37 -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=nTmqUa86; 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 329CA68979B; Wed, 16 Jun 2021 02:33:46 +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-am6eur05olkn2056.outbound.protection.outlook.com [40.92.91.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74173689B33 for ; Wed, 16 Jun 2021 02:33:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GbuIfOj0t+447SGMXxcpKItsXQFEyYLOhx957mIc4mxElQlPPrtUcrIXsLhxUBeSRCJ5asRAW3E2kBQXiDfZQo+HEdEkCEU2ivK+JFUgseYbQzKUIp1z4dM418j3ySv67l0V2u7zJIeRU4/rAAqFzbT7//vmslu3+pWBURoJdhCPonh9IN7mzwD6zz8+RPg68GWlVVR9/csMpcGrdAc1A82Mc0BppNp2jgwSvZ/S6st6lNC7Yd+mUSuycopOn4M9XDCe4V0aKKpwM1pOV+kowNqPTBhXhnCkiE/1gs3nlndc9DoamYemuUe+RZL7GsBggOsyWNjIEc/CQd68P8gZNw== 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=K8zHNqRRhbJHF7lhT068TcYis1hlWkDxHwq41ITeALc=; b=mDYKnslgiXDWohjTR9/KrwcKqZXdmKZ9AXmKv8MwVKGH6GF5U7MGlXRxNiFceTzcz/f9Y0csDaTQxhjnkU35oeHgrBOUZVc6Lf3NNWGgJdr7r3uVB2VDxBeLo5c8T60jk7QKvPQW+c/ItAZr0n+xczyfypeM1Jk9+rwLrrgmpCux5NQN+oiDbRmqiytnCpkgIJwOoEixDf7DKXWmnVZJxa+ec06s+rDmvMndSDNz8wDMmaZ1Aod9T9OP/k6nLFYha+EXmB1ptN5iMdatGUaYPJ9LX+Z4KtgqmXVTBODLp1NddiStpdMOSqVTAue4I4gu2FKW1nPH7OlXneHn5Gj6WQ== 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=K8zHNqRRhbJHF7lhT068TcYis1hlWkDxHwq41ITeALc=; b=nTmqUa86lxacbXGBHeTDND4iH1/+3VjxdGAH49XiYkOZJPAUSOEqk/N6nt985ZlP5rFtAshoYuZNy50wXdU4ZAOQzJlIKITVpu66dW9vI9odXnKIXcbHFn+CkJ1BFiPfo9vL/yCq94qb8MQdrhgHRtIOZTDDTr6Bhm8IZ0SgJ353Ljdcf1Z9T/BAd8Si+7i/yi8ZJHumcRJa+loP/7HHt/ZzxVVpmS5k9pyJIAZogkcB/2QSrWJKJzknKTNJSMRiLQE5vVKC1S6WXUHCQGSOy8JV+KBsj+AO10hHoMfTTgXtBo+62OUU36dATEXknsQ++SjZhwTuJpR6znixuqcxwQ== Received: from DB8EUR05FT030.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::40) by DB8EUR05HT223.eop-eur05.prod.protection.outlook.com (2a01:111:e400:fc0f::432) 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:33:43 +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:33:43 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6AA6363998DFE1183ACF5BCBC03808759AAC1DED3D3C6151ED18868FBEB62545; UpperCasedChecksum:92997ECE26747E8D2738B29748C850C54649FB2D5538BF5D7D6186D62CC16F2E; SizeAsReceived:7593; Count:48 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:33:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:13 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [P+vkq6lH9gOwykHspfxEmVZQ6syH50G0] 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-23-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:33:43 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 996cb3b1-f32b-45d9-55b6-08d930560390 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pQ3gFot+Jrk9mLI+N6jfyjCyR3nvnqtBFob6iScERZNbTE39jqKA7JayuX2Vp1hjbL28NFEgMYqcwedC2DxLu5cb2hJthT3JZFHwTdYUmEy0QNM/SzsZna/8MfP2d6nK4DPkQiZnFyucBFlGSlgwYy987qo6tdRwKK+zRLlGNDstcGJncVen+peJI4mFNX56sOKFhyU13/QrULOuFOBLbHl4muw6sl+9Cm4CpCQOc9Ini/tjqLzNplLOTVvxXp/1QUOqdLF/jOGJNocpFizIRmGhEAx3PKrtPIZD2zvTVVmQ/Q8EVgU41ClHVJIgOWlDzgXHhy+lPFLOdHUd9HU+k5H1uVNlZY4Hu2dE+hqpnhE8vWC2mCzmcVwegwDGM0gLmNSkkXkZgPt0CkxnUBmQzrMwlYuTo5cu4EcKt0dNLh6ztd055pJQ6evJ7lLU2h/LVZTgexI8PPTy6dcYg9VUGUu0uKu5DxXYyF2XAb1RXvJqbhg0vIFCp7+XV24P+ppzvrVT4tuSyu4x2Y9QPiQQ8So4H7Z2a2R5Y9h/vW/Hh7LxxhwzAceJj8ovSxT6kzYgvJYdRYPA011xGRLLWkB6XjQ0OYG2yAme8TH07Ek9UIUVUC/b7KxqzyVxI2bNYpxmi5pS9Qeii0iBQknoFfyw2opsIpPQ9J77BLc3g341qm6YJzdp4cfFPjdTYgivTXdgRzVTKCRJlXSWmTTxAaxlOKO7cMXXAo3w7NVjAYl7r1Rs= X-MS-TrafficTypeDiagnostic: DB8EUR05HT223: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: haSoToQvFBaTX5ZtdFTpAiI7wKagmcs2ryu5oiwNrX9Ut8OxHG9QORu1tu3FaFqC92esUso5HVZC37L7ruLvckvtpzl1JUGGY43GFRIGiHW4NeOIOkRnInAjx+DXVAUwkT3Pf1t0EIS8M2OImdEdyNtX55HI60KDMbEe32laoIAnW0MIPw9+Zz/MUlZgumhw4vN0vojgq97kBLShoAyxjkLxgWqcFGN8LeBrQHyskDhRHXuDP2ZpyeK76qZOEMyhhtS0tA2sRXRvs2sONlks+QfQAd6hys9XGsFnQFynbI+Kp71SdDo7KvcFYopkohwKF+wBAZvzap/A+3N23DyEjkMxaIO2qKtSLZnf1eZ3bF2WPQhhFOTQdSsvgkGrLxGGC5XnW3pBGpRyn7inz+JBWQ== X-MS-Exchange-AntiSpam-MessageData: J1x2QfKk2LuywztLilmGxLwryvfTBOPLz1SxUPHeZykZ0vkuYvNLIQj0YcCUcpFXz9SJ7/poh0N/NHQpDF4SFZCj6aku7UYQHuZJPYrZkFSDWab7hboM9UDIjcaAwHMP1Ehc1q0zEcdezehoP2QLmQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 996cb3b1-f32b-45d9-55b6-08d930560390 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:33:43.7346 (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: DB8EUR05HT223 Subject: [FFmpeg-devel] [PATCH 24/54] avformat/mlvdec: 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: pvfx6IDHFHHc Content-Length: 1477 by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/mlvdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index 998bf42dd6..6a3aa15a4e 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -52,8 +52,6 @@ typedef struct { uint64_t pts; } MlvContext; -static int read_close(AVFormatContext *s); - static int probe(const AVProbeData *p) { if (AV_RL32(p->buf) == MKTAG('M','L','V','I') && @@ -380,7 +378,6 @@ static int read_header(AVFormatContext *avctx) if ((vst && !vst->internal->nb_index_entries) || (ast && !ast->internal->nb_index_entries)) { av_log(avctx, AV_LOG_ERROR, "no index entries found\n"); - read_close(avctx); return AVERROR_INVALIDDATA; } @@ -485,6 +482,7 @@ const AVInputFormat ff_mlv_demuxer = { .name = "mlv", .long_name = NULL_IF_CONFIG_SMALL("Magic Lantern Video (MLV)"), .priv_data_size = sizeof(MlvContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = probe, .read_header = read_header, .read_packet = read_packet,