From patchwork Sun Jan 29 10:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp2663828pzj; Sun, 29 Jan 2023 02:18:00 -0800 (PST) X-Google-Smtp-Source: AK7set8yAilIhGVZAORQtIh+ozDK0HxmgwXsw9hDDciKso6SwvXSHHuTUc0ZdoWbv7GpTCJoum9n X-Received: by 2002:a05:6402:2b9b:b0:4a0:e0ad:8d3b with SMTP id fj27-20020a0564022b9b00b004a0e0ad8d3bmr12412048edb.3.1674987480196; Sun, 29 Jan 2023 02:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674987480; cv=none; d=google.com; s=arc-20160816; b=fGLCcPtZeMBtwXc+ojkVbI4cSiC4mD7TlZEnfogm9dFxSagK3pO6mKlnjZJx5LUV90 WQKSXFjY3YkrlF1mBhR/Dgl+T/xF9Jm/Iu9u4mk4hOrUMnkmXb8feP13btkh/K9d/qXX Ij1Q6k+LiL4AH2fjVlGmblfhGGbBIkKXcUKdrID2YRJub9tlv7IxOitBmjTKDO0Av/yb VQQehQdCjJn3w7GDXTMtqbCVhRrM+gKM22Fc4evXsjMNHOTx1kOWErBvldwTZcPuYBDM BfQkdxytBTbLV6JewciveDTfin7oE5jmUsCLWI9rNHGiG50ILPXIeQAxiiewlwr7lIRt uelg== 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=PM2v/51qgE0YIJOJTQ7B3keS+7Ao4hJp2nLR7PwDJFo=; b=JHArAgOyRGjyysNt8WMoLo+agtX4hFvzDDzgKNj/FX96z9mcKpJaQkxe6udTQANipY OQ5w7dY1XSUeEUry/itrQ3YntSO1MtezguojE6Y7urffmx+Mk8CLQBo+0iX4mi3fYPlM tGUIEqNxQO/rNZj2ibSQIVjzC945CnLeGYmxwP2BwUtFPXlc8o6OD4QUeOaM0KWCWEt7 ABEJVXsPlKW+gHf9mUhMkeRBTiN0Q70MTRluJ/5B3SWrnIMdLOPrxwQ0AfV3iLfSPePl o/xGj8VeZ0UaoxaJnQB88Sz61MwUkuPzkgjyj+klafLph4sH8HVvqpk8EIIw2Dlu+c/f hdGg== 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 s9-20020a05640217c900b004a22edeb64fsi3650278edy.271.2023.01.29.02.17.59; Sun, 29 Jan 2023 02:18:00 -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 EDC8068B1E4; Sun, 29 Jan 2023 12:17:55 +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 9743068A846 for ; Sun, 29 Jan 2023 12:17:48 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 442462404F5 for ; Sun, 29 Jan 2023 11:17:48 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id fb_FNIeFcUDT for ; Sun, 29 Jan 2023 11:17:47 +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 9A4B0240178 for ; Sun, 29 Jan 2023 11:17:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 51C1D3A02AF for ; Sun, 29 Jan 2023 11:17:47 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Jan 2023 11:17:33 +0100 Message-Id: <20230129101735.14173-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/fifo: remove FF_API_FIFO_PEEK2 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: 1GCyLOaD+HpP It is a part of the deprecated FIFO API which will be removed in its entirety, so there is little point in having a separate guard for this function. --- libavutil/fifo.h | 2 -- libavutil/version.h | 1 - 2 files changed, 3 deletions(-) diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 70f9376d97..0a1ea70a60 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -416,7 +416,6 @@ int av_fifo_grow(AVFifoBuffer *f, unsigned int additional_space); attribute_deprecated void av_fifo_drain(AVFifoBuffer *f, int size); -#if FF_API_FIFO_PEEK2 /** * Return a pointer to the data stored in a FIFO buffer at a certain offset. * The FIFO buffer is not modified. @@ -439,7 +438,6 @@ static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs) return ptr; } #endif -#endif /** * @} diff --git a/libavutil/version.h b/libavutil/version.h index 60f96af5df..9474c1c24d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -109,7 +109,6 @@ #define FF_API_DECLARE_ALIGNED (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_COLORSPACE_NAME (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) -#define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 58)