From patchwork Thu Dec 2 15:05:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp201834iog; Thu, 2 Dec 2021 07:05:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhxc3qwTlj+PzePmp9OEjrZiBEmnHdq/C9NWAQ78oKKs2qW32YObUXv2qd4USQxFNfbRHY X-Received: by 2002:a17:906:52cf:: with SMTP id w15mr16247181ejn.122.1638457547864; Thu, 02 Dec 2021 07:05:47 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h10si4723112ejx.109.2021.12.02.07.05.47; Thu, 02 Dec 2021 07:05:47 -0800 (PST) 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=ESMbsREK; 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 056F668AB35; Thu, 2 Dec 2021 17:05:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073015.outbound.protection.outlook.com [40.92.73.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9085168A782 for ; Thu, 2 Dec 2021 17:05:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RshXM2egFF5MXlzJOajcUTMvp2GacnxO5LhZBI7euUNY/f4Pk19Ul2q/CJNxU2ZAIdbgGcmqeNePjkMFQeD+obPhRCmEMOPPtkNa0bWSadG0fwDXyXkt5V9VlNlXzSBjGO9AcXw2Pdjmnw8x2SiHG0iGVdr7axQFADK8YmQGTMiuVkAm7yF73BgX9nEKb/s/1OxrssxUPA7/H3VO8wAFXqA7MOI+x2ehymcUNRKsGI975n5DdF9CCcGJX+pC5AZ95/42u23ZpMeHHHNklHwd1HsP0DKZh8B7NXE0U7pAj1Yv1lF/3H8EQLwdWOpVMTx9k96KnInQGgJecRnMRm0qIA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yllP4iqbQ079vIhJs9voycYOcjDDSmmtDMf854tp26M=; b=MvMJjxTBKKAMTXZ2S8QscJmDpkDam6GoQ/IqmEb7nmRAw/j4pHoIIbkTbvHpNHN4AQx1WYw2YbrmdigOZosRtuK0TxmLPO8774MA1Zh4oZ8+PUJUhluhpxuJzb1LS3/MFo/2267sglA+1leNUjCnCzTRgKeEgXTb9fdi7Uvn/R/IV3r1/gOwwJMt1ND+vC+OUGyRJI8yl1odDNN4AqFRRwmUX4t+2pKlm5Imr0yo69maJx/r2YkdpH3/DoAfSChHITpZFpQHd5dqXoX5JmLCj84UfHhwTlZrriFfVgKIOtBC+OmTKkS++oc4gph17eDi0hs43HIcfXJ7OW6JHMhjgw== 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=yllP4iqbQ079vIhJs9voycYOcjDDSmmtDMf854tp26M=; b=ESMbsREKHX6SkadVroCX3BrgH/F70BjuZTEISZy/lDDtUgc0T4iUSlh8GcLBk9iPWghF281PdnAntLSJLPcE+H86roC/I0CG97p//LlMaTKkroUhDr0K1inpN5XsAv7RqMeR14/3hlRy9gcEzgk9mN5OCr+piewA4cj4sL5v+be9dWkf8gqvqTkCwjX4PkilOot+U01tumR7JRB8SKs0Fxs68RiQVX0AT8F/ntjIlXrezmQdlkxR7slyLiYsewJsNkjjq837VNOcDTCvCxbyf97lA5qrx/jVfLuHueliigy4kYcUAn5EOkmvnhQsEFck4GnBj2xtpakNCxonRrr2kw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3090.eurprd03.prod.outlook.com (2603:10a6:206:17::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 15:05:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 15:05:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 16:05:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [UdBMXJ48buzhytRx3Wg8bbFWzmIgtSl0] X-ClientProxiedBy: AS9PR06CA0033.eurprd06.prod.outlook.com (2603:10a6:20b:463::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202150527.883774-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AS9PR06CA0033.eurprd06.prod.outlook.com (2603:10a6:20b:463::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 15:05:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5584bfef-57c5-45e8-0f74-08d9b5a5313e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXnrnTKVombrxkW9xGrTHPP6m9QjPIIqJXkEnrU4rr0XoxoWuJatkJYZItIAznbyZjzeKZQXuLZ5nzW7VQ+hEvXYKzzewXyqzCiQRdSANzncpzhUL3F4B1r+flVw8dNsG1brMZqOlLyx+230QGSIYQcweZdoYx+DNM3hMrTrrm349j9+xyIhca+PfgSuk+diMd59fnbKuiJnRRRy+LcW6hVzhaK4togdvXKASvRbvL8s6RwufovSnW5aoQG/n0vv8L4nUDKfM00XG+vZ0mHX84znrBypULN9+Xjgyo/lxz2z8xyZ7cBVpUP2pYU0WlsuhosFC3dI2RWtWT7kmj4wn7FunI5xfFK9Wwaq9D7qAA1/rjkpHt7tBknz7HsCoqoD+TiGCpMxzHVoQjQAnEmtaNGr+TJ5xZ6bVUa9W+SQnM3sjXI+v3VXCOBxAdGAJ3qAidWNd2Z+yVf5k1RVfVvjyrTBcDm5phWsATDnraT26hU2fxykxGXh81T8CMsV0X93OEntQuBXmVM4S+w2BdoB54brAZf4X1uSGwqANMIYfsCkFRJAxXhGbPY8QhNo0sCrCvB3dgfw7xKdC5pZXQNzIwEReTar8USlVG2Ed7Cb3zvI3mznE/+8jus2C9kKrTkzlFVXqCAl/H4E5goCTsqsHsaq63Z8vn/fbfx7CLpO/fU6WDyLTWcjztWOohA2y/PfDqar1cgTl1WIONAlvzq3O20LpY7rO/ZECQ= X-MS-TrafficTypeDiagnostic: AM5PR03MB3090: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1piomrVfPXoGLw9lXSwKHxA+HpFriuBAr+xlAQT4rTLhAiGGpSAmZjzxUu8x/thQfDQL9C8s4qtMweJ6getW5ohJ2isLOQKaPcAlVnCN+NB81XiTA9RWyHRR77XFsYe47hvZ9/tywDpmMibll/3MqduqXnVO/mItIV579t01HxI/bkJzfh1nseogKSuJg/Y4K+hnSqAPwOTVU/8HrRW8QJ2dzaRlxf3vqQnhj2CraVdbcmExhKXA4wR06kYw3uhtBLZyP+klxUZenm3u0DFDD64VKDZHzLWv4zyELuaos+J5G0xMVee9UWsPKP362Jwz13ZQTIGKUyaqM5pQvmEAAW49/6xREK9gR2K9PXJR0RCEFaB2uFyEIUxoyM2acwLo3GS1F1Iq47+gZ9SPkrmNZ7u/sv4XmvWecvh4cStdpTOU7qmqB5GYDE8HppPGloO5/uJMQVzPb/gb1uMmHFsrVsPiC1WeOqkJl9oqCe+Q+WbH8gtCLMbKQL7vVZ2YdjR9hc6Acs3INpLcGxKMTj1AhnsQyYJEOmbxongLTl+GwjKzvmIl01GzZrPMGPoIS7J4Gqtr+amo+W6r0YqrQgoubA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M5LQHFje2fw1Za0myUfNXQl3ue6Y4eV53NTKeicTb+sMT82uiOlBAH5ZV+aHOd3HtSmt4Sxj/gnmWfRH09dZixL9WpIAl3M2OM9hZXhIyVewUFZQqyIk5oYDtJDVe+dQPhZCsSe1IhbPlJXmMv8dRDENd5DxgfnnDp2sQEw/berYLIOFaadMs+/g0pOwSNl+boZjpxhRkBnwGjA/4lt1rbu8W05zz4WeQKjmtShXCCqAFBM0pUOdVrUyhJYEvd2jXlyT5sdlM367YrsywkAltJZG0itpBZZ8tLOiGD+gMPhVqYhPs7zMBEOaN0oyTcSIE8UgcgFjr4coWq7FJ5f1qSRD+XhqJfSxOJcpLaPLTw+JvLjwcGc7hWM6xny9qzM60Da2EhwHcPmPXNpGuFsSTB8YAPkM86M20SoGhGG6RPCvEIPcDT8cdCF7ZB5f4Tdjo1TFUwS20bU1ukbGSV7Tb3xYALdQIecN12RElRYlxVayQO2K//EFsL8zHoArYDCr6kK8cN+9ppo1tkIP6Lk+yCql3LD+elRhE00OUCZPxz04ZqcCDEDbuR6hKVsIRsjuUkEDMsx2ghNcAZpxdlnxPNwvlFAJPVQnPMa3tUs9Bw0Cp4liGGxmQ9dKTcZ7lqr7NjGmDUJmRWiodpLUw+16wyOgjJnhzEfvoObfXxQ3ESSsF8HoiwOqpzm1MpZ+aIs+nWUON3x/sZrjyDkMcoTCBjC3GsBs3SC09YGMKkbhsVytNo7xwo2A17J0sxzwKnF5WlKk5UY7LQEbIp7biZDCrAZGCUYRh3dI5lzpqowXFXaSAtP77IBvebr9rwoZ9ur/quvUIckzJ/oYtOKjXVQB3ueEf1xzbu8MDachGi01XmH6Q0kRKQK4KTRT+o2yHhqaZmzAjfno0XdWNZZEz+LUa2RJoAdqUI4e/pr0Q1vwii62lOJCA2f3bo19eE/Pjd902hbtrVZ1k5Fdk3o2RTjmuA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5584bfef-57c5-45e8-0f74-08d9b5a5313e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 15:05:35.2205 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR03MB3090 Subject: [FFmpeg-devel] [PATCH] avdevice/lavfi: Cleanup generically on 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: +V0t1toB4T3f Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 4eb1f56f7d..826dafbd00 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -356,8 +356,6 @@ end: av_free(pix_fmts); avfilter_inout_free(&input_links); avfilter_inout_free(&output_links); - if (ret < 0) - lavfi_read_close(avctx); return ret; } @@ -507,4 +505,5 @@ const AVInputFormat ff_lavfi_demuxer = { .read_close = lavfi_read_close, .flags = AVFMT_NOFILE, .priv_class = &lavfi_class, + .flags_internal = FF_FMT_INIT_CLEANUP, };