From patchwork Sat May 7 11:28:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2123443pzb; Sat, 7 May 2022 04:36:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlnWKe2fjQHOk56KKDIM2DihJlwGytFqDBHXz7N+WcSX2kU9F1MMFK1Rg9CAFZrPZCxMSe X-Received: by 2002:a17:906:c10d:b0:6f4:a770:846e with SMTP id do13-20020a170906c10d00b006f4a770846emr7135967ejc.497.1651923377398; Sat, 07 May 2022 04:36:17 -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 i15-20020a170906698f00b006f382c47ad9si7632216ejr.846.2022.05.07.04.36.17; Sat, 07 May 2022 04:36:17 -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="tvw/hBdm"; 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 B6C3E68B417; Sat, 7 May 2022 14:31:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2016.outbound.protection.outlook.com [40.92.89.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAFEA68B4F1 for ; Sat, 7 May 2022 14:31:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QYoi7i3Sh/UafvS9l0i65u9QPktBSZtt0RJJjzSMuYh8YHPSH1cGtN4+XgIdsLxgakYv42vneHQ4qHaoXWcgrTiZYDJcsIzhiveTzPyXkn2x/rssCQ55eEjxws6ZIM0Y4y94stGz8uwQDCpPUAEHV1zKRKYrxnm4UNR0Qu8SOVXWq0f2AXXTixRrRE5/xGB9OfHbOJaaM/OMkPLM/3KCdqg+P5t9SbEM7BZHAdTs8YxgDGwG1HWggrC2wHRFfHMs3hna9T0ca1sXNdjXLOvUXwH3tuFGBSVM0t7szWNaA10TnEOQK2L8hchkrRp0DGubyo+puLE5tCKVAdjXskYJEA== 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=S+E5cd8pXEi7awUycW1WgEMIfmqlK8nsVJxdgTkZ+Gw=; b=WwYDsnggGk7uc6uGPKLwZke06sKHvt8UlYlfIrAEPH66OgpI0MK8IKKJszso1USSylBZpt9RKLlyQwGeEYdTMotSwUnw2yffIwlqewlSpFbE9CGm9pKs8wyTj3pH22+pMy4deExIFjfK2JP4PPlUOGHrmpEuNHXTGr6CrZzGQY4fBVGugQN67Joz9ocdfHxUrC8f/eRHPfXziIFbjhlFn0P68Ups8WWFguy7ex9em15ShcOYC9rNwdwA4CZKDJ7TcbgCCU6aSAsw4mdf6RvDGSAoKekhHaeTm6EL+/Ey1a6N/RVJnPpAF5icA13BVhOJDoYNfD+ANUif1BUiHqYAKA== 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=S+E5cd8pXEi7awUycW1WgEMIfmqlK8nsVJxdgTkZ+Gw=; b=tvw/hBdmi66fBMA6E80eBXASzX8sjwB8P1FMKJ3RkdsGFwrEJ/osUdWerlvhXEC6KEx2IhtIcTWVozvo63v/TUumnEtb6Xg57mMTan3LsG2kJMm4Fc3QgnUnrUbqgDgB7fVS4RklkNbEZsIPc8v3RYIARxXsaOFfnTrjpqj0AAL3TkJftiMLPqzs9maK2gDUhTnFffW9v+HT8nAk6Vy+bPItsYly0RxjkK6xOkA3DJT1w2MROsh+0g1l/xbfuw8/2nrJZipeqBXkCb0disIqz98HGfgMn9i1I1Y0xQnGr559CLBtTYYB8TbhyPrGyPgEGBbZsIierOfF3P6w/401Sg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3128.eurprd01.prod.exchangelabs.com (2603:10a6:209:c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:31:32 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:31:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:30 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [8DHLZWROoQhUA+SlRsTHSYvitSioZriA] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-43-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dacdcff5-21ba-4660-669e-08da301d19d5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVZjuqTokTVdg9S7+crVfX8UW/IIpxLXYxDxE2dstFo4RNuKt9kcvPkA+Ode7+6Wh0XZ+DT8vbCyy9BIKxufgm9MjpSnbnx74ok12Ocm27nP89EFm6dvNpQzE3rojgL7wnWUrxRUIix/Pya8E125HeA3WMB2hyUiISlGMMFmFIhKo++RKNbDNddNLHn8Rqs1V02I9b+S+QVDPlj+Dc3pflgjnUOEujFLF3E1YUiTmaaUYPOR6Ng7gi7VwOACNsYB5zQoxYuvOF5YlmnIDbHSRuQ4EN+iGnKB7pYr0Vxnm3Wn7WpHanvr6qtmlYYIyXSUoADtgPcSRvaQ/w/83qfFvCB/HpVNrzlQTK7qqetwMt/Ttse7kqXHeBIte1DHWamDKWwNUvoXxhzeSCGaFskGAkiKxnHZjr0g+zWhtIAc5nJIxtFu7DK0U+4/GTmaNDBeFmoz/xrCJjTmGeNDMY3cjdncR3w9oW+Gc/cosjvQxiBgdw6shZ6oZ4xj0p2Ez8a2cJ9Zhge3EL9LU8HTAc+pgNXpdEaO6W0aZ5fMWgDkXXOhR0Y4vPKGda3Nrd2/Sxipxl9anKb3MOmRO9012BTN3DjWZD+tp/tyFoPUZ/fO41J1RxxibcMx2Ag/utjhxhNnnsCxF7L0b5ext5eWzdZHd92e/P3vY6R5A2Z7fqO0cMLx8efhN9y7l8UXk+NmFECUqDTSMkMEnAYj8XTHsn3DIik0qpYjZjRG/Q= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3128:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iWJ33G5z7zQv4efrKNMX/4T7Zb2Mh6sxVlQkaBvZ8mX5VlMSVA59xs9nZvAUaW3vVTtmJTp4Ieeohwl651AXkEoL+9NbgjxwaMxi51wZYQcXaxCdX0296gAbCo5/nFr9KVaUrYTqiFQKklMsFjo7k61kKDsYwxNgntBbt32ruagTmekRbixTRpfs+fEOdvt6UQaHtZO7vOKDqvTujK8w6S/kl4kqLZF3P3fy5roiy4F/DpxF1tzU+fmRHI+aBUvEp9Atj6OKnLFxYOYVaOZR3MvrFIMLgmTQfl8dJ7gWLIo/DyodHE6HDvAX9xfdR3ZBg2Mnr4tI6CvQ1WwIOx/6+kpu8UxROmaYaTtac2yBKWDVFTu7gaIy/TO5rX65ovqymhAx4QbdxiD8Sf8b37EBBB8YhKadvlu0u0A020HItGJOK8Uvz7YAo0s64hMHDNf7hLnVwdHVVpBU9PWGJzjTS2cBCLqCL2tYxnVfRDyxCs0meBu3luSe8LXCesMpLMB/KppNU28AcF+RjN/IqjzMEqxpTz/JfS2WhbMoe+m/ft7RhIHwQrY2eKMyE9IPNDqlk1PDFOM5KJmftUz1tU7F/APt7DX6qsCMpKhPY+Tvts4kmr46CnGd4ikNDwgF5iKL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: On09w9O/vE9XGusvW1OzBnW+ee/wxRwLFTm73zDinFNxDwjk0Gd35XhIBdSqAnch2FThLRfDFrm4qkbzY9zj5OOd98vAIkNmupFMJAptfRDZ3Fs7+A7Tai9jb/UubIhd25oUU1cEPSLfhbZPA/OcnjH8mswCn3D1swAhV+yZhf+ByKccBUHSzHKV+ROTxuDp2+fwTTnrpT2hY+uAtwIlUDerhdnRlS96AMXpLvdczJamOMVz4U2/ZCo0JIGCq+BK73yVzVkJawDrdYgeMa4VvD70JMNiVUKQlTDjM0mvnYZ9GUBXLd1r66Ru6+uwA+LjZE2FqQIbpFduDp7rbg3CJeLpfFt57X1D3fJSnR67xvLBMfK3bh/WojOD0xaXuPBaHBn7n2HCuqthqqbm0DTcQqTLqMpXNJAp6t29ZR/WJl9x1H8CxcM7Bo0bkEmCDhEOhWIVVhLJvisNBJtoUJYGXfazfSvHG9bUJo07PfKrvt/GZfRwBkXWbcIKj4foHymfPZ76ZiSKYneVl3e+C6AJo+BWcP4nxhTvmD/JcpB7Wb2LwyHu6/5qZODzU5ZVkh3gczjCYdvMsSOflKXJEI06eOkgc22L8BV8hbCaH0/OB4fBhdSY5UgDcmn0qVfvIwyNUIEBA9KmPBUS98vJPbl9iTZIlDbGz1s/fXKX82XFIrpEXkqh39M1DeNZmvf9ooLoIe/TUezsWHaKYKTJfO2lIkslYmqt0lIrwQNV+juwuzaAz4SrsFwnHB2EPRBo17Dp7eQsHq/ft/9KSMwPhtsDbY98pVr5cvy/O4akdgPOIVYnUvJQ7YmDd1ROx5b7legcVlb3XXCnmsq1Re7maw2THgaQw3eSr2hYmX5E6deuS6w/f8xWliBxuLgJE+QiO/C119DM5QF66IIhBEV20JDFJWastMEZ/sX87oJzvYuxZrMQYYbVUp3LjyWeALFGrI5ijUF0QO95u6JwjJKrox1ByDKrT4/p3c3MzP6d/1g4XQ4xNu+4OzelUyCLx0ytyPQ1zuAFxg/XgdA4u95WTR9e5IwWNX+/0aiMfDX9gkuLFdakeKde070SabvqhrHFC+DRS/vN3KjGNrPGA2pRHIT/n7aWs6IZHfIK8rECdGYqwreqKgDh82e90+mSpU+oR5PR3W+k8lfGxdjNR2elNxTwHtq1+4Z7VXbg+bsLfopaerenm5xiqxB43m9co0m0KYh4uqXCtJk6uypCc9W4E6CwHxxsLyFU849dgRUf4GRQR5QchdYtXm1r7WRvszlV+zKGLNF+PhLBXLtjN29EuX1mypuEAxk026H/3q21zE4gVhiD0zQrwqnQ/2X40luU7ZEAVgfW2IsRaxC5pPtrfS6b7Afqe0wBu8DghyZaWFv5vNPDxqJz0fplqbs4fdhef5/y1WcLiAYjYaF10p49umk/NYuRnv50lJxnnCvHCQFQGGhSgFG4LJ0VyEGkdZ0RkSUN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dacdcff5-21ba-4660-669e-08da301d19d5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:31:17.7414 (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: AM6PR0102MB3128 Subject: [FFmpeg-devel] [PATCH 44/44] avformat/utils: Move ff_format_io_close.* to options.c, avformat.c 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: o0zZbfK72Fm2 These are not pure avio-functions, but auxiliary AVFormatContext functions. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 14 ++++++++++++++ libavformat/options.c | 5 +++++ libavformat/utils.c | 18 ------------------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 3eae41d109..30d6ea6a49 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -33,6 +33,7 @@ #include "libavcodec/codec_desc.h" #include "libavcodec/packet_internal.h" #include "avformat.h" +#include "avio.h" #include "demux.h" #include "internal.h" @@ -774,3 +775,16 @@ void ff_format_set_url(AVFormatContext *s, char *url) av_freep(&s->url); s->url = url; } + +int ff_format_io_close(AVFormatContext *s, AVIOContext **pb) +{ + int ret = 0; + if (*pb) { + if (s->io_close == ff_format_io_close_default || s->io_close == NULL) + ret = s->io_close2(s, *pb); + else + s->io_close(s, *pb); + } + *pb = NULL; + return ret; +} diff --git a/libavformat/options.c b/libavformat/options.c index d306c86c63..0079a06d9a 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -151,6 +151,11 @@ static int io_open_default(AVFormatContext *s, AVIOContext **pb, return ffio_open_whitelist(pb, url, flags, &s->interrupt_callback, options, s->protocol_whitelist, s->protocol_blacklist); } +void ff_format_io_close_default(AVFormatContext *s, AVIOContext *pb) +{ + avio_close(pb); +} + static int io_close2_default(AVFormatContext *s, AVIOContext *pb) { return avio_close(pb); diff --git a/libavformat/utils.c b/libavformat/utils.c index 667ed0c4c5..cf4d68bff9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -575,24 +575,6 @@ int avformat_network_deinit(void) return 0; } -void ff_format_io_close_default(AVFormatContext *s, AVIOContext *pb) -{ - avio_close(pb); -} - -int ff_format_io_close(AVFormatContext *s, AVIOContext **pb) -{ - int ret = 0; - if (*pb) { - if (s->io_close == ff_format_io_close_default || s->io_close == NULL) - ret = s->io_close2(s, *pb); - else - s->io_close(s, *pb); - } - *pb = NULL; - return ret; -} - int ff_is_http_proto(const char *filename) { const char *proto = avio_find_protocol_name(filename); return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0;