From patchwork Sun Aug 28 23:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37536 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1625074pzh; Sun, 28 Aug 2022 16:35:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR7lRETZ7SEeabCk7bfUrBXo3RJek8LVeoQ7EyeRpL+cLSK5ZJrqucjMPW3ZHWD9QJa8EHvK X-Received: by 2002:a17:907:7242:b0:741:7cd6:57d5 with SMTP id ds2-20020a170907724200b007417cd657d5mr2283495ejc.419.1661729742808; Sun, 28 Aug 2022 16:35:42 -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 jr10-20020a170906a98a00b0073834b89a87si5456554ejb.488.2022.08.28.16.35.42; Sun, 28 Aug 2022 16:35:42 -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="cQZq863/"; 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 0224368B9CE; Mon, 29 Aug 2022 02:35:24 +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-db8eur05olkn2045.outbound.protection.outlook.com [40.92.89.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F098D68B9CE for ; Mon, 29 Aug 2022 02:35:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CbEmmsJRb3uXhvr+AjiVjLBqqCsgj9uFFlOkpcUFbfivlrZ9Y/2R1oJRiskdEq6MYrCpNFBY8MUrWaqzXWExh5PXLDW/pFe/HpLoEVRCNp2s38TPi3VST8iC+ND3bQJotfDXVrHA95F12HlfqkSkZofm93ZOgmITbJjbnnpxsao/4SkP7IuL8sRznzOQbY16+xN5sc9O2BgoFt17ywpPJmnI12ppcJEPkktYufDA/XiYLZ6EbbJAgcHLkXHUskS94/c/c7g6/QJrp2LktVKT84MAne6B0qSjkLe/y0l4LUAz/nIgkU9meOlhqVYsHAHzDUXx6FptaQkuezahR55IGA== 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=g6rNmLAxnKDZtzpgMLIA0M/RsGrIY6D87BrWj9CF5GI=; b=FrBQRmXTqxuyI3NtEVANBTUEi9IPkXmoYElZ/Bae398N+8CCz7OiFp8CHnpTHYhr8K8IfMhDESvLOX/egj8aLMyfs9kkfeyXdic2Sy3gJjPhCUPHP8ZACNgls1fQD6ErqDNO9+1D8OXcyWTTDKcgaZVBd6y6keQ5HupNL2sGIr7XtZsqhfzb5Ee/dKM0iRA0HylqwVK3QpT67Cv+9k28pjQ1tZHGDzbiof6wM4rfiDkHSgz/3EZA67in48dddA7oI/zzYzZVptDjqYNTrD9LG1uvGb9LEpMuxbaBW8RtXWXNv4jGDMdoz2wustZrDfOBofriEfPMN5y5wmjSsn83Fg== 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=g6rNmLAxnKDZtzpgMLIA0M/RsGrIY6D87BrWj9CF5GI=; b=cQZq863/V6hK2tslps2kmCmAkopJdZ3qvDRnAJHesTUTdk5GNzwE0U9bfLRZPkLbASq0ENIQ6Y2f9/tRBWG2mIoh9YuaXdgpPvCushFi6kqDN+QO+fzUf4inSu+vq6hj5VaLgvcfT7Hi0GOtZx0B4tOhcSy4E3c9PiuBoEAEaMhp7CSTUl61RezKWwDcdTHOjZOdJ3bGMRVWdeEdO7oT2zSWzzi8iiFXJqqIlNmB8l6q0Jp3ge7w40SMaQncU0MytJl90mrbeUCjOCPRt1t6E3sLoy5HuMMfYxJwvnMi9s4j2kaurxlvm8eCWYIvrmYRU/hl4dj0aO7u52tdT1LmJg== 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:07 +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:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Aug 2022 01:34:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [D2rNsn13k1QYP6h9axKxcOO/srdqFKj8] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f1c608d-5eb7-4f01-25a4-08da894df104 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOdUA4L2/qgFffW8sMzDmP9u3e2HoMJYAPlkMlzo0TBewGiO2qnsylBCzZpokw4FePcxNPqT9+bOP+L8lrynR3r11QqiNmwA6ydVqjrhTliyqzkdjZC0kFlO2uX6V2npA5nTGepwsFCQkfudf+MsI9AAArJGdgLZvXVQyl4LPQkFisTSXeodUpHTzkEbCp43MrDfCheC/zfNOuL4Y3wknUzxeiFZL56GnnKzPiq1vtHHFQfK7XkkPb7CCV0lJHWqzznEWfAygP8ZUzyznRuMB8cyCpeIrcwMUPGQUHkPIZyWc8o0CcgQOtC12JmreZ5MaFvzP6bey1LV7pi0/XStpyW1zxmBJIdqh1p3VnFCrxRdVO2l/vSaIi6l2PViNGg646mFfCUv71q4JW51BBpPAQmejkpuOksPi8iJ4o8IE6ShEs12kyJKy4USAncf1f7NPFL0a1BhQTHRtNHBxKVLm0RU0sj2kUS3g4CzaLXSvAfW1rU+AQHOFQIBJIHqdNtVbsX5aWBRLWlXxQ7LOSPDsKgeP48j6lWxHCTMb+R5T3XmsKGNBRBRaUrOHxyRwBg/4xlZtEGLgSHb4vsmLAH5h0Kg0HfsUOjnYgGEVmvm3DlfthraPNd95tEPw2gL+Lz26/Rym+wIW0aCqnAfKqiHx/2JYObHU8RU2cMcN/3zf8UYQy6Ame0vSbg+nBtysRBz1Khc5d+HjDa/3lIHeFzimrbYn3VEHTAU+4n+iUKIhZbLrE= X-MS-TrafficTypeDiagnostic: DU0P250MB0817:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0H2TShs5eP7JTILoRDZ+Lwq81V0Q05HgCiVJCKtkjBI5BwUyNMaIAzAcAuCjWp9ak06i8zrnkWgJ1GACDGND6Q0KcZ4bSYuLtCUzml9BxdX3FpUVzNle7lWsG6U406MmK9KiMeicaXPS+sSJZMr3FxMHp/5hCu9zZQiYWl1MWT1Vz7CC0gLnKyVXrcQ0/Y7x85xLbNHTn7UJ3/UOzAqrfAFG1nmIJYUYB2WANzA0RC2WE5mi+AukbvnPdggfHV4LH8QxMEnOf9poByijuG1hkazhbuiTokTYIYj90F7pLFsp1mEjmZdfS28h6i2bW36RkABQRxv++caB0i/XXCaUKYCT1hUpUJCRO9PnhABLAwjV/8xo3TPb3Uv3JJUnV2shvIbTYCRuck0uvmVbUb9InLyCC9EMDE4Uz4F1mT/gK2dJLxT+ZZ+43Gcrnw8IKv1CPKavTvX/DXh5jluJ/TqBKEQwTSUP4e0sIL3rzZk/ypshw+9IfzbRo6PVXhIRjvt/7WTv28wN33VxyGP76hxTDlRHpp2ln37oEyI14oLwKhjNu/gGwFKMl3bzSA2ffRnRTZN/LKJAvV2i5eyKw4JE2zC0u5rdyCkPQ9GwNkhoxgdhbL6s15HUPlUiIrhl7Wa9/BZsIYmACCG1FOQ+uJBedA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lACeW+lHNGZNdDuLZPF09A5fhGeXJFo1BTraQn7yEoKBOhBdoXgpMKh7N6AjSEG9KCZM18soT1B+iZPtaBsVINf8AHhiAoNhVUt7HksUwhA7/6Q1VAwnNBzfJffoGwOUo83hiqca4IBfT+1MO46+l5nbzYEeP2/cwMiFMxo/4qo23deXSQ1XfGJz5SlFx0qQNLxmq5f9BnMgTBqoHKO8+xW9+/ts7NShd7/3saVb6fTyEqG++nUzxU1u1zpotcn0YPMs1RbtR7prB72Vr/YkHyluQ4jK7B1VpQ7fjOuaJhoYGqAnnKskJYB+Rqd3MM0g0bDsK5iG7ld4SmOFYkgUlL2lPyaySKtf2WgR5gGr6hkiTtT91amuoVxV43QffBskoLYygWB+xYiAg6rAqP7tp1CuO4fWQEoOidNJ0XXa0NebOcG70TlQHiPW6Ukwwkz9aAN3MZYmczwsQjhhMbConnObl7PR4mHKizRIIyhaHer3hw05rqLNKfSC7gP6fhKITR9TGAM9Qqnvm+61GOEOKuBSjrbNA69JfxhmHoGd9TaWLsKODuf7omV6QO1kzEjHG/9lQB4foiIHwFjir9Tfp4rNu8rf/N+tuudguNefF9qSt7gtxvNolo15IkAKcQkvERx/uwnY3/rQ8wRfYsmMthDAfq9bUKirg90ovBUMJmvJrZ1hr4uMMCyyWqUuqhekSw9LUstAYyn7KC0efFf/zxeOixteVdNMfb7JeNEO1xmKwfltuhOHrJZh7GAvqkwLewXMwh8ONb5SG4qL0oC0UjFR9PXioLDiZte4Ha0MccFpeRu+0Ek5Yzx8LajKmiiIlCZGNFb/EswKc4VAlksED9+Su8sEryRj7OIfzeeCZpMjJxa217PnwxSPbvHrTcI9+XszRSHNHGQQALsbx0exeeCfBERUxfoeFXEy1ELM+wPNF7Swhq/nnfsD8h4IGyDr0wgAZ7Pjt2OBWXHmqXSZgPfIMK94mDFUk5DHLvC8btVXTuitoGZ0MtqaP7uPGhinloPRNQSIDHcalFuWemuLqlarUHzmcQijLSW8Crt/QKmojKNAaUx2h17/sxzw8bMJOX+0XHLt1e5+Pq+rsR63X+j3odykNMc1NW52SJ7JfpHp9+evuGvpNLOM6kFk9kEA0qSG+3wlhF6BieEAar0gUjeidM4eu3PcUGjAPt8lBjU+JQTB0Mcj7adL2hdckjcbOAkNadyf2lj1zQjWygQsdz9bSpKtkmHeXjPRdYK7WytMpeLo+e8bLBJGWa//bwEdpt8ZGONH/qFlkG1zS07SdAoAFFEoS14htSouMUf2USU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f1c608d-5eb7-4f01-25a4-08da894df104 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:07.7132 (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 16/16] avutil/fifo: Properly deprecate av_tempfile() 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: ID5uGH5SJK1T It has been deprecated in b4f59beeb4c2171879d0d7607a4a7d6165f07791, but the attribute_deprecated was not set and there was no entry in APIchanges. This commit adds these and schedules it for removal. Given that the reason behind the deprecation is exactly the same as in av_fopen_utf8(), reuse its FF_API_AV_FOPEN_UTF8. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 3 +++ libavutil/file.c | 2 ++ libavutil/file.h | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 1cd13d4ed3..45fd8f251d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-08-28 - xxxxxxxxxx - lavu 57.xx.100 - file.h + Deprecate av_tempfile() without replacement. + 2022-08-03 - xxxxxxxxxx - lavu 57.34.100 - pixfmt.h Add AV_PIX_FMT_VUYX. diff --git a/libavutil/file.c b/libavutil/file.c index edee6aaf80..6a2f3aa91c 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -155,6 +155,8 @@ void av_file_unmap(uint8_t *bufptr, size_t size) #endif } +#if FF_API_AV_FOPEN_UTF8 int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx) { return avpriv_tempfile(prefix, filename, log_offset, log_ctx); } +#endif diff --git a/libavutil/file.h b/libavutil/file.h index 8ec210e783..511c100db4 100644 --- a/libavutil/file.h +++ b/libavutil/file.h @@ -22,6 +22,7 @@ #include #include +#include "version.h" #include "attributes.h" /** @@ -55,6 +56,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, */ void av_file_unmap(uint8_t *bufptr, size_t size); +#if FF_API_AV_FOPEN_UTF8 /** * Wrapper to work around the lack of mkstemp() on mingw. * Also, tries to create file in /tmp first, if possible. @@ -67,6 +69,8 @@ void av_file_unmap(uint8_t *bufptr, size_t size); * libraries and could interfere with the calling application. * @deprecated as fd numbers cannot be passed saftely between libs on some platforms */ +attribute_deprecated int av_tempfile(const char *prefix, char **filename, int log_offset, void *log_ctx); +#endif #endif /* AVUTIL_FILE_H */