From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D508244110 for ; Sun, 28 Aug 2022 23:35:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBB6068B9A3; Mon, 29 Aug 2022 02:35:22 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2045.outbound.protection.outlook.com [40.92.89.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2E1B68B9A3 for ; Mon, 29 Aug 2022 02:35:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fd9FdBEShi1nGKTGkVdLpcvUZpzvih6NUVDJmYX7mvxL/XOVV3eFLTaNkJZqGuHxi7GoThXnlDkPYbtPMZBv5E1My5T8fEjm03Mh/sdq36ry9LCJlEd0lsHGFcMKuID6IcRryoxZGHobdK9/yKJzW5xnMfSdyaxVSwRFH53RiI4fH3rtK2z0GM8tsTOcUwS3hFP/aklowBDrrR6032ylpgUGcuDtwzrL51fvPhoJ4Deb0O6V2HkaPgierP88j0vZpF6CdVWOyUEqm97K9wJZjz4c/jQVMGCAvmLuSGDwg/lf1J1sfCJKA5tf3kVNAMimdUu+VhI11sPW/DOmtgJe1w== 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=nH9SfBo5jDRQbPxNaV9ha/+wVNDxRWy/ORy9uUV7KOk=; b=BAINtHd6uW7f5X4lga+M+9MAjY0rI+NtlgAZIXii0l04PhnNLhRv0Fyq4mZOCVK8n2NRYEhJe8yAvjmy1swhLBpf4aY89N88hbFthhFEgnyARLON5NZdv87uFL3aIPvKLuMMhj1dDOLsw9X6oYESCz1PzaruMKbhHCO/UVi3siSjc7XyKtJnyfX/ePnHUIs+JCtmSeZ7Mh1r51S80dEAfO2+ZuilMDES3Ls6sAORjPX0/vDApDwjqiO5pGxZ7JlJg49ZYZA5KD+wmrqfhzHu9eDAIPHN+MaLOTV/+UBgup1NT39j8XRksqR8/QTJLpj51K0q83Wok7eNeuKyActFTg== 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=nH9SfBo5jDRQbPxNaV9ha/+wVNDxRWy/ORy9uUV7KOk=; b=Q7BTRuPlyk6uDB4Vd70kFGOgIPUEDd5viq1mi1snQ2VFffG2HS19u6ONcaW+3hQGGAHlwzblCfwxKtBp+gpqOTUK1LVEQG6/p1MRSo4IXL+zozNZ0j/yKF6OQegPKs6HqMEO67q9M9S3CexSDHxwepIQ3BE7bdwWbCQZpdttNFKGAIIBQ9MFIzzYPH0kgc3Gw5OU2I9pAAZflZWMhoBGMYaFXOnqMchFDPFwKVkJQ2zrcOd3u/iTqrRl00djPVXsjmetYqhhOd9qsH0LJq2w9IkdX3LEPGEqFIv9qoLt2dDIirSO2EvWDk+Y0GYNqf1+vnu809KXmyiIiKMf2E5V3Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0817.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.21; Sun, 28 Aug 2022 23:35:06 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 23:35:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Aug 2022 01:34:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5C0J9pfqlTcXJwf1uqNMUYuhEUt0EGaJ] X-ClientProxiedBy: FR3P281CA0161.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828233448.490158-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: df6f096b-f2d4-4890-8e87-08da894df07e X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOd/OkS5cJtCFEsswCxQxB0+BURrYeC/QtGPaOyFN31u1E23xgbeNyEqgmjdPR60tHAPM2jhdGTc4lfBjnu8al6LBL+ZOVnAztzTVn3lhwzAPDmLZ3DO1ul+AxzGrknBRIOod3NGVh+NcCl27cTyYPShgI7rob5gpYpfFLOTeXpk1wWK7W821Wy6rB9Tk9TsichnUJvh4ZPykhj7OjA4ECCGW3+xG0KRn+coFCSobwm58CgIAmTEUfsWvCH0uZrvNgVBDxhGuI31OBX6XRTksXk9b7u6vwXa5nCEpiGOV2PsAuCM9Iz1CZF6GPertUv3MYv1zQI/Sc0dbEDBCyoI9+MUADdpP2+Czh5xiGzL0BdfqdrClI/EjObeTTtbR2MAImhmkyzbG0VjHuNowlWNEGDfUmP79xTOii/Bb8aZe49M7fj/JATcpyvUmL4PCbW0TbQNcuoIZF/uhQdVyXq/QwUWNNebfG5K+3hu821RIBVJy71vVT8dbbaX+U158NhXzDuvAPdFeJUdruWqsKAGc4jIoKE+x1QWucpX3RTNkJf+RtOgH1RBXP6g2GF5/MqzyYjXpwn199StFVyp76ObHfsHiMYTUHMfFci7y4S0uw/Kb+CRnbvqk7SMpwR6hQLixLus8uHwQHtraKbCLyPP+LcINWSMAGv7NH/WagcTE6+rsWW42HwSZa3YeTXeGK2ucYTNBVEWqyAyYUknsXrPL1CHL6pQ0CTenfMDmJ1JUGWW/A= X-MS-TrafficTypeDiagnostic: DU0P250MB0817:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dk/5qJJgLSp95DIOtElWsFNwBprSLhgBzdyzy2dGgXzGTYjk2VTblJsBCYx9wfDNnwuZ0KXfGOFHcFKIGTpdnXab5siDlLpj0w+Hg/rmPdYgZhWgXuuk6WhS4aON9eCHsBAiQK8xsvj6hNuGPZ9kGo4S1VtcV/jaeB/HcBNVefLba1DoW/mB9QMgLqf3Y3WK//TGeAj2Z+skQuvQd59CDD8BS3CW21ymde0pYjVHBzki2LrG5vd3Su2PmKtx8Y9LU15UCzmkF6YrmSchvwq2mGsG3V8HkB4qaYC0wZ0ea445iwCFU4NwH4G+q3XDncvs7VKcn0oR2JbqQzXxVNSRpKvg1uPU1D1oK99t9mH9k8Fd5QXsgmSSeAnZq2M/Pjv+h78+0IWrY5eX6Sycay1o3ie3F9UJqVTURHbPvXk+u/NuhEPP3cnpjK9z3IESlM6II+yHH9qLYFpdx9TfRpUMFdenJD7M1j8rEd9Y10xy5uRijnGhwqsPLsIC0tadM08uKs2YhC6/Vo8psX83ZFd/n0XxTCObPquJ/mWnWQ3VMDauuN7uKwQIFWG86AVN0v+/Y0k/a2l74NbnL4tFO1beikupvFX/oEZViwOCu6GjKFmqxAQ8LiDj/JsEsXbqn2JN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OMiaZIAyNAa1Dv8HLVTkyiCnLxawx/2iFLwtHHrVq2BDIQ1M1cbbQx+ZM69m?= =?us-ascii?Q?8HaaDqEWVpbHBZdac+zAv3h+rjDB2eZgAFd27o+g8V97s0JXGhzqoZf/PN5I?= =?us-ascii?Q?+XFIPx8WK9yG/gcfmHjqaNBaFth/N1m088R0bnQJTodeaw6OkEX+y3g0rmVW?= =?us-ascii?Q?UE8EFaSQU0xZrM+zPZmzC366v7PS4NeCD8owyli+CiJpwwIpaCk3rd97KnKd?= =?us-ascii?Q?8OsISsq0doRMSWSV1E9cDjm4RiR/k/LVOqrqPxZzU5aQa2mtHqLztVXiDSIo?= =?us-ascii?Q?W5srXzQEjt0+X1deMnquVVEnfeqnm0uVvJJMheE+noHDKIY5f38J5Gm16Uiw?= =?us-ascii?Q?lS+ucHNs5CjyuXxhay7sWp+ihCR+RKYSj5B+ZhtUoOgLKe5gKUIlSGzTbCLu?= =?us-ascii?Q?C1i2pfLn2IlTJEOT8NgygebzDzBdR7V3+M4LtHBwmXIYJEr8RtHa87rkdMQe?= =?us-ascii?Q?Dzq1txXZBBgXi0kgk89wM2VtTa7yLhghHuU9oUKvXM54AI0nEYmsPeoI/3c5?= =?us-ascii?Q?Z1nAo8BNEtZbra/Oo8pX0eAnF/qvHowx62L6/XzUZLZ19M+TMxrAkPCre2kw?= =?us-ascii?Q?pd8B/UZ/jml8XZKe8h0Scwl4CWh+KKOlMh3asvDv3pU/ordlVjDIz5wW/DME?= =?us-ascii?Q?3bjmCd9SCH5MKGqMOwQd5oTqqt8UGhKThMHfnACWfQ11jF0SuhoLQgDs9U3b?= =?us-ascii?Q?0OWfxCaevsfq9S0eSEWIC/Uc5/ieAZlCB+2y48DwjHkBkANgzYbHq/ccdVHR?= =?us-ascii?Q?172UTlPQALCMxKX+qWmp/SVKWwgXT65ISN6tNHrSlgmeZeP/je5odX679XIC?= =?us-ascii?Q?ND6PECbKm1DZPJUCMKnRT05D2LPzPaqKb1czuOcRji8VlzmWKC111My0Kc9k?= =?us-ascii?Q?tMEj32oRnVOEfdDsvbiCMQ5kxz8Hxr2L2ROqex+KdO5vNucMpKbPr4H/SqOX?= =?us-ascii?Q?FTrZ2y+vaiIA7qVL7+T3KTmFxUsB5P6ruwSmgPX7gOEgRCXGLGI8RP95Q4hW?= =?us-ascii?Q?w+/4pPoC+mCHcVqAXY1ywZ4B9WPf54QmLchb2la8GWk3slUNC42W1MhPvaXg?= =?us-ascii?Q?8xmQuwYgOFzhafsJiRLyQwT95BO3qJ9i60CMgWQy4ftOWenHmDJ0En+rkGFB?= =?us-ascii?Q?CVVLpUnmsoM0aeYf4h7ufm6OHgWzHsFt2zZFzlcvpVwLJMJX7UwPn57H19jE?= =?us-ascii?Q?/rrHbpxmqyTbEyd4oZDYBs3Qia47zGVvBUoxkt5ZhQbhhpWCjSDt1y3u4+56?= =?us-ascii?Q?YUaiCKmhsX4qmALMmppSRftV6skwoDJtKkRd+bGkoSxklIzJYzEw9aCDmzBr?= =?us-ascii?Q?NJE=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: df6f096b-f2d4-4890-8e87-08da894df07e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 23:35:06.8540 (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: DU0P250MB0817 Subject: [FFmpeg-devel] [PATCH 15/16] avutil/internal: Move avpriv-file API to a header of its own 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is not used by the large majority of files that include lavu/internal.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/dvdsubdec.c | 1 + libavcodec/libxvid.c | 2 +- libavdevice/bktr.c | 1 + libavdevice/fbdev_common.c | 1 + libavdevice/fbdev_dec.c | 1 + libavdevice/fbdev_enc.c | 1 + libavdevice/oss.c | 1 + libavfilter/af_arnndn.c | 4 +-- libavfilter/af_firequalizer.c | 1 + libavfilter/opencl.c | 1 + libavfilter/vf_curves.c | 2 +- libavfilter/vf_deshake.c | 2 +- libavfilter/vf_dnn_classify.c | 6 +--- libavfilter/vf_dnn_detect.c | 6 +--- libavfilter/vf_fieldhint.c | 1 + libavfilter/vf_lut3d.c | 4 +-- libavfilter/vf_nnedi.c | 2 +- libavfilter/vf_paletteuse.c | 1 + libavfilter/vf_psnr.c | 3 +- libavfilter/vf_signature.c | 4 +-- libavfilter/vf_ssim.c | 3 +- libavfilter/vf_vidstabdetect.c | 3 +- libavfilter/vf_vidstabtransform.c | 3 +- libavfilter/vf_vmafmotion.c | 1 + libavformat/cache.c | 4 +-- libavformat/file.c | 3 +- libavformat/ipfsgateway.c | 1 + libavutil/file.c | 1 + libavutil/file_open.c | 3 +- libavutil/file_open.h | 57 +++++++++++++++++++++++++++++++ libavutil/internal.h | 28 --------------- libavutil/random_seed.c | 1 + 32 files changed, 92 insertions(+), 61 deletions(-) create mode 100644 libavutil/file_open.h diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 3338cd6b92..e1ae441880 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -27,6 +27,7 @@ #include "libavutil/attributes.h" #include "libavutil/colorspace.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" #include "libavutil/bswap.h" diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index aed8699fe1..3845905555 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -30,7 +30,7 @@ #include #include "libavutil/avassert.h" -#include "libavutil/file.h" +#include "libavutil/file_open.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index e96c4a359e..196637852f 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -25,6 +25,7 @@ */ #include "libavformat/internal.h" +#include "libavutil/file_open.h" #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavdevice/fbdev_common.c b/libavdevice/fbdev_common.c index 91bd8e1a91..47e7edde5c 100644 --- a/libavdevice/fbdev_common.c +++ b/libavdevice/fbdev_common.c @@ -26,6 +26,7 @@ #include #include "fbdev_common.h" #include "libavutil/common.h" +#include "libavutil/file_open.h" #include "avdevice.h" struct rgb_pixfmt_map_entry { diff --git a/libavdevice/fbdev_dec.c b/libavdevice/fbdev_dec.c index 368907037b..460a71d13f 100644 --- a/libavdevice/fbdev_dec.c +++ b/libavdevice/fbdev_dec.c @@ -34,6 +34,7 @@ #include #include +#include "libavutil/file_open.h" #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavdevice/fbdev_enc.c b/libavdevice/fbdev_enc.c index 84ec6733ff..77233880e7 100644 --- a/libavdevice/fbdev_enc.c +++ b/libavdevice/fbdev_enc.c @@ -23,6 +23,7 @@ #include #include #include +#include "libavutil/file_open.h" #include "libavutil/pixdesc.h" #include "libavutil/log.h" #include "libavutil/opt.h" diff --git a/libavdevice/oss.c b/libavdevice/oss.c index b042f58875..5c3eb6d4c3 100644 --- a/libavdevice/oss.c +++ b/libavdevice/oss.c @@ -30,6 +30,7 @@ #include #include +#include "libavutil/file_open.h" #include "libavutil/log.h" #include "avdevice.h" diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c index 5e3403ca6a..3ef222bc8e 100644 --- a/libavfilter/af_arnndn.c +++ b/libavfilter/af_arnndn.c @@ -31,10 +31,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - #include "libavutil/avassert.h" -#include "libavutil/avstring.h" +#include "libavutil/file_open.h" #include "libavutil/float_dsp.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index 85bdb59209..e0f35c139e 100644 --- a/libavfilter/af_firequalizer.c +++ b/libavfilter/af_firequalizer.c @@ -19,6 +19,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" #include "libavutil/eval.h" #include "libavutil/avassert.h" diff --git a/libavfilter/opencl.c b/libavfilter/opencl.c index c8e7e6e1a5..5d1e297af8 100644 --- a/libavfilter/opencl.c +++ b/libavfilter/opencl.c @@ -19,6 +19,7 @@ #include #include +#include "libavutil/file_open.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 82e2753f01..498b06f6e5 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -22,12 +22,12 @@ #include "libavutil/bprint.h" #include "libavutil/eval.h" #include "libavutil/file.h" +#include "libavutil/file_open.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" -#include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index b37cffba9d..142f88541d 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -50,10 +50,10 @@ */ #include "avfilter.h" -#include "formats.h" #include "internal.h" #include "video.h" #include "libavutil/common.h" +#include "libavutil/file_open.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index 852f5ddcee..d242aebcfb 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -21,14 +21,10 @@ * implementing an classification filter using deep learning networks. */ -#include "libavformat/avio.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" -#include "libavutil/pixdesc.h" -#include "libavutil/avassert.h" -#include "libavutil/imgutils.h" #include "filters.h" #include "dnn_filter_common.h" -#include "formats.h" #include "internal.h" #include "libavutil/time.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 68bd2cd0c3..7e133f6af5 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -21,14 +21,10 @@ * implementing an object detecting filter using deep learning networks. */ -#include "libavformat/avio.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" -#include "libavutil/pixdesc.h" -#include "libavutil/avassert.h" -#include "libavutil/imgutils.h" #include "filters.h" #include "dnn_filter_common.h" -#include "formats.h" #include "internal.h" #include "libavutil/time.h" #include "libavutil/avstring.h" diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index e6061c6d3c..4af9e26925 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/file_open.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/opt.h" diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 358fe13e09..1ca448fcb3 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -29,13 +29,11 @@ #include "float.h" #include "libavutil/opt.h" -#include "libavutil/file.h" -#include "libavutil/intreadwrite.h" +#include "libavutil/file_open.h" #include "libavutil/intfloat.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "drawutils.h" -#include "formats.h" #include "internal.h" #include "video.h" #include "lut3d.h" diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index e5a16918bd..63b83e5efd 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -22,13 +22,13 @@ #include #include "libavutil/common.h" +#include "libavutil/file_open.h" #include "libavutil/float_dsp.h" #include "libavutil/imgutils.h" #include "libavutil/mem_internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" -#include "formats.h" #include "internal.h" #include "video.h" diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 5c491a290c..a6b5d5a5fa 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -24,6 +24,7 @@ */ #include "libavutil/bprint.h" +#include "libavutil/file_open.h" #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/qsort.h" diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index fa2e887e9b..15cde7e8c8 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -26,15 +26,14 @@ */ #include "libavutil/avstring.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" -#include "formats.h" #include "framesync.h" #include "internal.h" #include "psnr.h" -#include "video.h" typedef struct PSNRContext { const AVClass *class; diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 7d434328b7..4896e8f2c1 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -24,13 +24,11 @@ * @see http://epubs.surrey.ac.uk/531590/1/MPEG-7%20Video%20Signature%20Author%27s%20Copy.pdf */ -#include #include "libavcodec/put_bits.h" #include "libavformat/avformat.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" -#include "libavutil/intreadwrite.h" -#include "libavutil/timestamp.h" +#include "libavutil/file_open.h" #include "avfilter.h" #include "internal.h" #include "signature.h" diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 37094b23f9..1933b9b82d 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -35,15 +35,14 @@ */ #include "libavutil/avstring.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" #include "drawutils.h" -#include "formats.h" #include "framesync.h" #include "internal.h" #include "ssim.h" -#include "video.h" typedef struct SSIMContext { const AVClass *class; diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 044911ec27..62b998e171 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -23,8 +23,9 @@ #include #include "libavutil/common.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" -#include "libavutil/imgutils.h" +#include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index de303554cd..1914d7b348 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -23,8 +23,9 @@ #include #include "libavutil/common.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" -#include "libavutil/imgutils.h" +#include "libavutil/pixdesc.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 6ae968f7e9..137afd9245 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -24,6 +24,7 @@ * Calculate VMAF Motion score. */ +#include "libavutil/file_open.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "avfilter.h" diff --git a/libavformat/cache.c b/libavformat/cache.c index 1e19dafc6a..115c2c2490 100644 --- a/libavformat/cache.c +++ b/libavformat/cache.c @@ -29,10 +29,10 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" -#include "libavutil/internal.h" +#include "libavutil/file_open.h" #include "libavutil/opt.h" #include "libavutil/tree.h" -#include "avformat.h" +#include "avio.h" #include #if HAVE_IO_H #include diff --git a/libavformat/file.c b/libavformat/file.c index 98c9e81bcb..6103c37b34 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -22,9 +22,10 @@ #include "config_components.h" #include "libavutil/avstring.h" +#include "libavutil/file_open.h" #include "libavutil/internal.h" #include "libavutil/opt.h" -#include "avformat.h" +#include "avio.h" #if HAVE_DIRENT_H #include #endif diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c index 907b61b017..ce69d9055a 100644 --- a/libavformat/ipfsgateway.c +++ b/libavformat/ipfsgateway.c @@ -20,6 +20,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/file_open.h" #include "libavutil/getenv_utf8.h" #include "libavutil/opt.h" #include diff --git a/libavutil/file.c b/libavutil/file.c index f228b723ec..edee6aaf80 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -18,6 +18,7 @@ #include "config.h" #include "file.h" +#include "file_open.h" #include "internal.h" #include "log.h" #include "mem.h" diff --git a/libavutil/file_open.c b/libavutil/file_open.c index 58a6073353..9aa4e4ac61 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -17,7 +17,8 @@ */ #include "config.h" -#include "internal.h" +#include "avutil.h" +#include "file_open.h" #include "mem.h" #include #include diff --git a/libavutil/file_open.h b/libavutil/file_open.h new file mode 100644 index 0000000000..7b6d9d969b --- /dev/null +++ b/libavutil/file_open.h @@ -0,0 +1,57 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + #ifndef AVUTIL_FILE_OPEN_H + #define AVUTIL_FILE_OPEN_H + +#include + +#include "config.h" +#include "attributes.h" + +#if HAVE_LIBC_MSVCRT +#define avpriv_fopen_utf8 ff_fopen_utf8 +#define avpriv_open ff_open +#define avpriv_tempfile ff_tempfile +#endif + + /** + * A wrapper for open() setting O_CLOEXEC. + */ +av_warn_unused_result +int avpriv_open(const char *filename, int flags, ...); + +/** + * Open a file using a UTF-8 filename. + */ +FILE *avpriv_fopen_utf8(const char *path, const char *mode); + +/** + * Wrapper to work around the lack of mkstemp() on mingw. + * Also, tries to create file in /tmp first, if possible. + * *prefix can be a character constant; *filename will be allocated internally. + * @return file descriptor of opened file (or negative value corresponding to an + * AVERROR code on error) + * and opened file name in **filename. + * @note On very old libcs it is necessary to set a secure umask before + * calling this, av_tempfile() can't call umask itself as it is used in + * libraries and could interfere with the calling application. + */ +int avpriv_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx); + + #endif /* AVUTIL_FILE_OPEN_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 8bdc7b3ac8..14f3acec58 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -155,10 +155,6 @@ void avpriv_request_sample(void *avc, #pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf") #endif -#define avpriv_fopen_utf8 ff_fopen_utf8 -#define avpriv_open ff_open -#define avpriv_tempfile ff_tempfile - #define PTRDIFF_SPECIFIER "Id" #define SIZE_SPECIFIER "Iu" #else @@ -188,30 +184,6 @@ void avpriv_request_sample(void *avc, #define SUINT32 uint32_t #endif -/** - * A wrapper for open() setting O_CLOEXEC. - */ -av_warn_unused_result -int avpriv_open(const char *filename, int flags, ...); - -/** - * Open a file using a UTF-8 filename. - */ -FILE *avpriv_fopen_utf8(const char *path, const char *mode); - -/** - * Wrapper to work around the lack of mkstemp() on mingw. - * Also, tries to create file in /tmp first, if possible. - * *prefix can be a character constant; *filename will be allocated internally. - * @return file descriptor of opened file (or negative value corresponding to an - * AVERROR code on error) - * and opened file name in **filename. - * @note On very old libcs it is necessary to set a secure umask before - * calling this, av_tempfile() can't call umask itself as it is used in - * libraries and could interfere with the calling application. - */ -int avpriv_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx); - int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt); static av_always_inline av_const int avpriv_mirror(int x, int w) diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 70dc509d2f..66dd504ef0 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -35,6 +35,7 @@ #include #include #include "avassert.h" +#include "file_open.h" #include "internal.h" #include "intreadwrite.h" #include "timer.h" -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".