From patchwork Sat Feb 4 10:42:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40278 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1871555pzk; Sat, 4 Feb 2023 02:50:28 -0800 (PST) X-Google-Smtp-Source: AK7set/TpB0fDp3vYU8PSsPoL6gd6+iMT6MxCfYnohyWgxR4Je7L5v2DlLfIT0sfgEdVAi+KP21L X-Received: by 2002:a17:907:7e9e:b0:87b:d503:2ee3 with SMTP id qb30-20020a1709077e9e00b0087bd5032ee3mr5761686ejc.11.1675507828241; Sat, 04 Feb 2023 02:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507828; cv=none; d=google.com; s=arc-20160816; b=ikHiVto992iRDz6ZrxHAVDKEd8XFJYTmXa9fqgz0kFKuBPk/xvCDM9428xv+EYHrhO GmjI2bLrjYckNJZ7c+jTfFNmYmXm6j6R1JEma4bLRJgYiAmcmgIc5Vquo8lUJ+Z9mTXG qWvvk+QPj3kNXYyed+4Ea+pDJEKk6IA2Y/MemC4gG1L/v2RMooQ7j3N9C3KeR1CfvQ4w 4LlSqWjtt1a04ozR1t1JwINpVstGUhJRrAd0TsgncgScxERCo4kf79cStpwfoRRyMzty M/Y7eeMf/ZV6akoT1lxSwiIh/eJToc0f16FGLhwMuZoYJ4zDKOWWetVAAbu1e5c6f4jG RZlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=GhzIUoU7B10Ugi4lfUOimgYcxrHuuj+lpNKsu02uEUA=; b=SmaqSEPyhnS9MprQc5C/jSyFmau0oPhh6qSDs2C4+sHjfbQvCcxdIWDUHORCatx0hv Ntf3XE8lox7IctoD/AeXyztuu0TgMBU5jF8k1a90txGuQvB+KA8jY8Lg6LCD2BQj2uS5 EK5rJErXuNteOPsMN6MXlkkwGjjl9B2rSmAhBDLVn5Y4JNbuMkYeIChslDv0gXjRpi+9 LEnvxPmYu6AqksxZlWQxvEo9WVR5agMBbG3eQ5bpmawYKiYWdZ1dp0anxDOfvax/mIrO IAPFgF7ME1MP0nDz4o8toKYy2R6LHTz7iu8QmHDHnXPB+9T8admvtFAoboGh7prNbjUw iYdg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 24-20020a170906001800b008888f4120c1si6466231eja.695.2023.02.04.02.50.27; Sat, 04 Feb 2023 02:50:28 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C73368BEE3; Sat, 4 Feb 2023 12:50:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F52668B9DC for ; Sat, 4 Feb 2023 12:50:12 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 394FE2404EE for ; Sat, 4 Feb 2023 11:50:12 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id SQjzxU87Pwiw for ; Sat, 4 Feb 2023 11:50:11 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 303CA2404F5 for ; Sat, 4 Feb 2023 11:50:11 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 908313A0740 for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:42:03 +0100 Message-Id: <20230204104204.20721-33-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 32/33] avformat/version: postpone the remaining API deprecations 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pBO4YVjc3DGt From: James Almer They are either too recent, or still need work like FF_API_COMPUTE_PKT_FIELDS2. Signed-off-by: James Almer --- libavformat/version_major.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 1db8e7600eb..b11f8113838 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -41,9 +41,9 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60) +#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61) +#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 61) +#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_R_FRAME_RATE 1