From patchwork Tue Jun 15 23:32:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp4314633iol; Tue, 15 Jun 2021 16:40:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4Q8fLb6V6Gr3Mn0Ksfv6UsiMoO+iS+igRZiA247Lt9Qf1U8yfvprmEghYheHtW7d+lRTM X-Received: by 2002:a17:906:b06:: with SMTP id u6mr2155031ejg.199.1623800424271; Tue, 15 Jun 2021 16:40:24 -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 g17si481451ejm.627.2021.06.15.16.40.23; Tue, 15 Jun 2021 16:40:24 -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=Wg+Y9Bf5; 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 94882680231; Wed, 16 Jun 2021 02:34:50 +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-vi1eur05olkn2046.outbound.protection.outlook.com [40.92.90.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 810E4689810 for ; Wed, 16 Jun 2021 02:34:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7mFDo3vMewJGSJtq8KlGX2QYMhlI5pBYYbWHWRNuK37WrI9fg3YqgC6eq1m8h13mUMf3ymmy2VaBa4+Pd2cCElvBIvT4p9yeEsAVuLnWE4ADSLXCm5oXwVyrsIK8xeeTyyRJxeduBF5uxPc5ARemyOma3x+5o4NwQQ4/0MMK9tn0TvXpW/iEO+122GSHQBO5qVlDwt615lITAG85CBAkZ7y+EdhHqnt0OkGN64N0Mgw/WBP/jcPcMruY/s1jx6JvTIThvOER4Em+Ji6xidT/WgZlNEeAyBZGtK4p3YdxdDWEkuAapa1maFuUQRrqKBUSK4t1Ua4pVnVud5xL2pWdw== 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=8FLXAzlfRnqpSb8fynFNIq1DO0PT3dOLJt7TFCsMd98=; b=gEQDfXsht9WFndDB1vXox4/IN+IyUdG4aKZ8L0zncduGtzPN+wygfLSMqt3yFF5lMjyFFxPyJvYUkletdtL0CM29O4MgYsKRAMvTrSey68G9JmUCSrNX2yeU7GGQn9niR4ZMRrOY9ep7EfJDfppohi4ZPIGpnHPyifcGHZ6ABo5gTXKB2xozHeZI5D76XEKfnWTkmUYitQJsBeHW+NC4Zblrn3zE6TaWUyslX5oxvmFMakkSHBqNr81eF62+yJz6t1jfpYyOpGgCRBXe79cgyNU4f1FlPhYzcd96JyEUI33SDbFOxH/0HkJubPsFwuj/OdQAXhfdNWOwheL4nmJF8A== 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=8FLXAzlfRnqpSb8fynFNIq1DO0PT3dOLJt7TFCsMd98=; b=Wg+Y9Bf51sV9iNaaNOLbfFj3dI7ZAU3y1Czq0LMRBa7cGAShnkfNN73Thn6MnVU0jvQH/P/HYPX2MUwVa8PZ/Q2wmdI68mzGJtRmRbaSw9oaJCTVjvSxtFqL4FXNOqkTWnDfvJMs+4dBlvjGDS7FEkthfcycQBS8sEpfiXOKesx1gsk7YRGHfmMldmzsPUuMgLWFo0zbxd9KlERq56lmUNhgJIxjYmboZZhxJuDfE4btxZ0NAxQ1GaJDZ8ugb0cbKh5jarPm/i+wYC7yJqC34J921jRDpIpaslhT7qv4ajpJqx2RVGrTbWDI87BnGdnCW+LYcX2EU3solKkazBaxnQ== 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:39 +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:39 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DCE6776CDF91D3FE655F795DBB61E54D454582DA1327987086245EDC25C29AE1; UpperCasedChecksum:56BE1D160B4F5C63E8E982E0DCC5E11E296156D7AD538316D4074586D72110AD; SizeAsReceived:7773; 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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Jun 2021 01:32:38 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [jZhu+GGCkFwORmg/3RC5358kViOx5lcL] 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-48-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:28 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 50 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4369359c-cda1-4a06-0efc-08d930561e4e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR9SlwCHtPrt+MV8TUUwp4pptWyrQdC/n5rcr7rK2HtEtCIcTMUTMMsNqLtyl5yw2+m/BER2fjzBwX37xRjs/ED7NnTXC+MY7BKL6GZpfxnmzDp4B99WszGBCDcL2uLPu1ir0tz1F0ecG35IBAOfAKNeFWXK18BkQDpKy7UsRXZHqBOcoLbGcV47ZrDsd10drTqys+eTjCRmpphCriipmBsXvTrpkYeJOJLKAF7lY2+L9CPibouiFtgJeMd15qPj3zMPbzPcL2jnXrTU1caxmXD9iLLImAZk4K3qvejJfgDyyZnM7MVz/sYpD54YFw4giiK6I64MB9JsQMc9FOr1G/yYPZ4UyLrrISB7//oYZ2thSVp1kjchDUsge1c7FZQgstUJbd/8UIbrziCpKw4tJ66pftCABvf92FY35ciPkI2zC6qXPL4VyrTh6MQohMeqn9ySMdXpN/tQUqpl7gSE4toNaxHYpvMxLdRAv/iCCNUv0lGLaHQXQ6zdtu9ntxAL5SHReilgCwVIHVKfTkA1aGACwKUgo/NxgCNUo3DDBN2hhmUZbrQk+K459MKg3AzfDBwnk3Nox+x5nFB38q/8/a2bvRgiguMd9nxHfKXFMe93YmeghseCS9KgGauoF9WzsnGp86jIsceiHnmbug2XeITmWbsZ2rWV7JWZP5S9vz16o5ATzGOTs0HjdYXlOP8PLPJKn60qQfkmnsWZGRxsFpUWKRJOQ7eoBySZgQTvVA0+k3jAWG27AoQQjHskO1FFpc= X-MS-TrafficTypeDiagnostic: DB8EUR05HT019: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y2W4xCg3SfeBS5BPF3AjEhK4dIcYWmCXFUaCGa0RPaJ1TdFHvtXpfc5Qp3wasaKu3N/frnII8YiOSVZDdCjYWP3bxjiFLCeM1+/lzhTo2wHLhTqRxw8DrnMqPffKYcKkhD4cIySx8FJ64QEExGT6LM7tzduGnUQMSP2ACUy1y3sjst88e//pano1e13kV1ZnDApO8wEh9Y9V/AYC3ZrjNwqTmuCsp2xLNCgvIPpBoYBHIudR9LXOcsfB1H/wWF7WfvETy9R6dUz6wcqcaA6xVB1YxTqXTWeCApWnygkVYMpk0sQG7Bw+4ckcKWCqum4J8h7Ufg/RTmRrNjvrxOSSqWZPa3Q8hGceBDnHlKHh/fpV8n1SePf5MHcmAfVYU0oIVZHeGxabUcR+GNExQQV9BA== X-MS-Exchange-AntiSpam-MessageData: W0Co3UJ31RtyMGeKmUSl8BtVYR6SveB8fBW7AyCE9j2M3oYWoBIgkLSjEjD5ewJ6PHFGYAqT26X1eSJ6SphPMwsvnrokTlpnF9khEqCIB2Cwll3UJohBXeqIgYU53oBw/2N8ZG2C1Jvkyo5xIzCdGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4369359c-cda1-4a06-0efc-08d930561e4e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 23:34:28.6427 (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 49/54] avformat/vapoursynth: 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: G4V4tdFGOO3k by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/vapoursynth.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/vapoursynth.c b/libavformat/vapoursynth.c index 4ec4e77b59..1578a6ac77 100644 --- a/libavformat/vapoursynth.c +++ b/libavformat/vapoursynth.c @@ -294,8 +294,6 @@ static av_cold int read_header_vs(AVFormatContext *s) done: av_free(buf); - if (err < 0) - read_close_vs(s); return err; } @@ -487,6 +485,7 @@ const AVInputFormat ff_vapoursynth_demuxer = { .name = "vapoursynth", .long_name = NULL_IF_CONFIG_SMALL("VapourSynth demuxer"), .priv_data_size = sizeof(VSContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = probe_vs, .read_header = read_header_vs, .read_packet = read_packet_vs,