From patchwork Sun Mar 3 22:36:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46742 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2497107pzb; Sun, 3 Mar 2024 14:35:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvvRdAswCDVteAPK878Sauqx6T9jL8lem6JmsxCIqfCIlgkhH3iH4bqRWbVZkMZZu3MBnFmH7E+7uY6pKTRMnGS743mqhBDhk6BQ== X-Google-Smtp-Source: AGHT+IFR5lQpT+Qk58T+xTFlCKfGKdEpmSgTItb3+yN2u/cOkfVHGbGt0iJWwu/S5Ixx727HAeXZ X-Received: by 2002:a2e:9256:0:b0:2d3:4c52:98b3 with SMTP id v22-20020a2e9256000000b002d34c5298b3mr4047057ljg.5.1709505310474; Sun, 03 Mar 2024 14:35:10 -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 d28-20020a50cd5c000000b00566e5846de5si2176817edj.352.2024.03.03.14.35.09; Sun, 03 Mar 2024 14:35:10 -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="U/pnCwC6"; 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 32AB068D201; Mon, 4 Mar 2024 00:35:06 +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-he1eur04olkn2051.outbound.protection.outlook.com [40.92.73.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22F7968D201 for ; Mon, 4 Mar 2024 00:35:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lFiy7ooR5isxAwpQhajuz7jS9cvaSCa5Yx/EFrHuBpcd0aro9kTcHHAzLQfkzLROuu6g1va3tsK5tslO8T137bG+Fh9R/USaVZnc+P6ZKQfiK27SQVRnY/gcrN5tFRRW5eRt/bguzZ9hErGdJETZsWpYLhad0WbGZ74XbLJ5ZSVZEpcUkMnac3XHQAX39XcJhLXxeupKYGoe46wonqmGLK86UjrGoOCQaFNtsMMjKKj7TZCp4Dzv1bgV753uxO1FEGRVFcVNv5p/imaLbh6ktIdC3T3dcuZv7YYct7643WLYsYNsRKTcNX/M5pjSxO0VvCCniWQWTn2tPJ7pisiJcQ== 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=/V9BpiGXhK0KeduNIcfAhuWMpFcH/a74eBhwn3vsutg=; b=aoBFETiD7BFrc81QvJq4zFdyB6rPZeingP2lyVv3uZtkSLV8+459YHkOOkpCny8kic/BCHl3Mg3fiyU5bPk0XPwFleBYpOx1dslPR9zm8IWuMW31mpM9Av56dPKbCoEzqwUFE/4F9YW3RFqL6Xt5h101RyoeJHsLgFPVWR6/vBBdG0HgdYoZPWEYlISdj1FT9AUWSjL9azhVDBR8EmYSCwG+6P15IgYnr5AjD4o0+e1gV60EiNvy6Nx/Ra6hyW2gKviTo+Ud+h8h4Ccvbhua0YNblPOgEPeedOBhDHzdHLwLCSIJbKz1XA9ozfZl//0aAXHG1D/q2h5GpiXwboGo2A== 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=/V9BpiGXhK0KeduNIcfAhuWMpFcH/a74eBhwn3vsutg=; b=U/pnCwC6eJeBGah+x/NgcEpc6Q4/qpRaGtREdYtn20Gns8jMVWpzOt0Wv5vNSWmqKrrfl1nMuC1oavJVu+YljQYYYhg6+ci1DOH6CaeYWJQG9guaKSMdonvunVQmKWBAkFszEwN4GjqhSxfgEMenWztRc+0vOrHtmIPmXF+q2097FsrC3hQIjwXPscyGLEpnaIDin157MZtaliFlMJg8PKGrBXQroGf1BCXrmXBgPc8I4yDoN53QDYJDf8zWbJSelJ3naIV6n6WCTYjFovWDCHpHLXFq0WsGDmogq0SYxKuZLRDq/S1lDhBqlhDFfMs8C7I/0OnHKR+/7kF5bsD79Q== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0260.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Sun, 3 Mar 2024 22:34:58 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7292.036; Sun, 3 Mar 2024 22:34:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 23:36:45 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [MTec/D4FHsWF06z3+p6hAJ+fpa+0XtmVLEDxh3hvuFA=] X-ClientProxiedBy: ZR0P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::22) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240303223645.879875-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0260:EE_ X-MS-Office365-Filtering-Correlation-Id: c5f1cd89-7b0d-4605-e58b-08dc3bd227eb X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqnx/C+6DC/TIciLJ1/n0VpbIID15KIghIiytgckJGUwIxv59iTLw9otfnb03GO5qTZwZIGQoVjA3wrEHix4EkY3BOc606BEoKx7BlULKb7kzuIKV+6PBsETizXSczCEzo+Ez3CzXOdUQM8elU3qAKiNy3MaA5ypzDiRpaOBk2v6bKlM8TCxE92LAdmiO6oi0yWzg5+CHbOdvSjGK4DFR+5xZV7zqvflYx2AwH6tUm0RUe+ETod+YR6b0LM3CfhhWSmIc9hdS95vk6jdROXRPSqjmoAP00YoQ4CXNY7n4AQxlAR/cxeV1VLSzfbGX68/PTZGOloj+2T/AnGq7TkPM56bPUJuaELAxHdRea1MWg9wviPXnobKQH68EAd/YhKJzBZjcnQsCeKKkJ9UZR0h9ZCMTqnjaszVzNBDeF2e7FuyVcsi0aZ7zs07aJlh/2T6WMScejLWDcQPVM0Q2fdeNgntmp9R38LloZ1YfJnPf/oaX6uCKSlp8K8btRiVUlr+sH7k2JI69tJyzferK40e+3+PM+xFW1rrR1kMGIn+IvUxu53YK0Pmi1GCIqd+gPw9P6/4qVxUcr9cO7IKKiW0i66kvJWLkXn7OQGc0Wm5EOe+K2tSuV1I+hisWweyHpjMnM4cVwE71qhHJBxf4B+5Y07hvHbMTUQR5gL0RnVqkKGq4fUNMhry6mnSBoc03dZ6kcVeztA9ypk9Siw5e00vTTRYIDJMiJpGu4R5O9ZlQMEEGtokLnF3tc+g0RLj/btM1I= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZtDISK4SKxixF2nFDBzmRcC6Zphd8XArLf9ckusAE+01GHIFSPiQSGNbInRU5dvOitm3q0ZtDI/XqmoDG362hsQ3ZOFZF6JSgzUcvl4NFBVSTvwOXvLjAY9QAmTIl+xcfib+ZhIvc3cHg4CsPGeJBto95ab8HisIPvuUYuImjJrQ2s4t6enDk75NPGT9GPBmOZEWagm1+Xj0DqLTMWpK8EIFHKGFyh1m7+uvppvdv5mCvICWw4T3N9ryDfyNgMYZKMq2VNapIb5xTpxwBejn/q32YZiKxzAru4obxQKR7XYwAtl9oimgFd0XxZ+JSYOkw/5/bXO6SmKPqxIOIHQ6hxRi3wNY1PC/F8NxJ6LiZ9K+z5IExhEWBedyurBOLofous/5maKWh8s/FWXLmoKPvp3yz67zsHLhkdWsadh+kK/pMKM3j3NycpRPgSMXPmgj7xpYSy+fYPZ0qeKOnUIwN/yWo1vw9ZlXtWrsBv2lVZOIH+yroK5JJhUAqNZAImU98h+FmNRsyAPB/DpeXXSS2SW1wnhU3Ie5I1CbmGYW/cWQbniOJcISRT1v+IZrBoIaGzF/kJckx6pzviCGwqBD+Yy5Ct6eWf0Y3mQQnAu733eug7hqXlW4OwyunohqFe7J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZJaJz2DisQrsFCxvKz/XRT8x6Vl2/mY0sPiv9ZlKFf/yoxxNbBXFw9sCKRBre+dnymyOPI8R4lhZngtRaUryDXMwiCwpTndAFH78ellngsNDqwtRDm8XcWt402ZIfV+V13myUc3qYaRvmVhAGAN9MIycVi8oLPm5lo2Hy4vuZwcLqO7mQsGCeDtTBSNnV8qYIpEzB0N5JYx8U/UaOGzsquvj0/Ywry12Yan6oWGziFXvAR14cJRfjBim3rA0BfpljxScIpIqCHlsLi4BdeQA0pjsAEMStmlugiCtM0qOnuH+AJEnFgRoCTGIqX0+vfd9txi1/6BTAa2Qpxs2BPkpk6ySpmIcKKRv5j4K0ltuPzRK3YXKfkzfGwGWmgFPsgVxFIsNgygojzCdwgMTgVWRk3XR/sWnm9Q4LWaKrZIdenKuG3MymBpC4YsZ5CL9w6LCwxH43Sk1bse/iVHGsmDD/fjYUdIYgIkqeYXItu0VNK7jPsrPjluHImGTOu+nV5AjQq3EOtUR6q26yDeZQU3QL7WZVc4OX/xjzrsW7JnGVWwmE8ZIWwBSxxsV29AV/9kZ8DTNJU9dShzW6S51G/0tXovx40AfsWKwMX6mtMrfQql7ImzDKCfIVYqBIfbJfWoAuaYZ7Lug53n6Y54et2ube68cv4RM8XSIW938AhDVGKsPY6kS+5hkQk3bx76S9E8BPtskEbpg4w6jfnG+93whJ0GD0zXew8RFFjD4XqYOJ/3K3lnrfFOSdnK3ZRvLl3riA6Dm2pg8h4hrqXvObhfJ7GYkOSZVV70AzKQYFLMqvVbrlFLvOezb4L0crwcuKAXsHh3Lq0+WQEBEkzepDitmSxwqWjvsqftSGGMVrIs3apcj3Qk1dVF3mlzBE+PG34N0koTZzFskij7Zwl47qk1IzzJPCOxe1Y6/UBJ80NKp7HYBOIdp/4I+2iQ2zXa41WE4pvTQZYAvVzLvt+U4xuwCanYiAp/86spAzPIrKuWeoJc999hLQudvpZMetLebWmYRYuGfgBunD4RC2q7vKvmA/vJemQ0hPPTf9kvhl7B7Uk0rMM6vRxkFL7G0nOWTxCMUrYQ5NFqC+6j+XaSpdN1LSD+zAoh8nXy2E4F++ECQkrYKq5eQDT4lfhUMsy1+wvgm1jtUpmtUSmgBKWSZkyG4H+8DPLyMVR9ffDLLdBRyyNft71dFA6/YJF/6CQOUrrHKnJfMJAQBWo3f2BryeFqXms6uLnFkoYdI556r+fAUMoLv9Rbwb4ifJaSVL52qfTjBb82fMUexlzxIBCZ8WEBgew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5f1cd89-7b0d-4605-e58b-08dc3bd227eb X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2024 22:34:58.2214 (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: PR3P250MB0260 Subject: [FFmpeg-devel] [PATCH] avformat/options: Deprecate av_fmt_ctx_get_duration_estimation_method() 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: hQC86GxQOLI+ Forgotten in b7785d10b00c88029d8af7dbddac09ab0d6f2b7f. Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 4 ++++ libavformat/avformat.h | 4 ++++ libavformat/options.c | 2 ++ libavformat/version_major.h | 1 + 4 files changed, 11 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 7d46ebb006..a72ec3553e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2024-03-03 - xxxxxxxxxx - lavf 60.xx.100 - avformat.h + Deprecate av_fmt_ctx_get_duration_estimation_method(). + The relevant field is public and needs no getter to access. + 2024-02-28 - xxxxxxxxxx - swr 4.14.100 - swresample.h swr_convert() now accepts arrays of const pointers (to input and output). diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f4506f4cf1..af064b4dbb 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2008,12 +2008,16 @@ typedef struct AVFormatContext { */ void av_format_inject_global_side_data(AVFormatContext *s); +#if FF_API_GET_DUR_ESTIMATE_METHOD /** * Returns the method used to set ctx->duration. * * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE. + * @deprecated duration_estimation_method is public and can be read directly. */ +attribute_deprecated enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx); +#endif /** * @defgroup lavf_core Core functions diff --git a/libavformat/options.c b/libavformat/options.c index cd7e4cea9c..0b3e9775d9 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -198,10 +198,12 @@ FF_ENABLE_DEPRECATION_WARNINGS return s; } +#if FF_API_GET_DUR_ESTIMATE_METHOD enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx) { return ctx->duration_estimation_method; } +#endif const AVClass *avformat_get_class(void) { diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 224fdacf23..c488188344 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -50,6 +50,7 @@ #define FF_API_ALLOW_FLUSH (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVSTREAM_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 61) +#define FF_API_GET_DUR_ESTIMATE_METHOD (LIBAVFORMAT_VERSION_MAJOR < 62) #define FF_API_R_FRAME_RATE 1