From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 513C348D4A
	for <ffmpegdev@gitmailbox.com>; Thu, 25 Jan 2024 13:46:46 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 168ED68D185;
	Thu, 25 Jan 2024 15:44:58 +0200 (EET)
Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com
 [209.85.214.175])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 052B668D14C
 for <ffmpeg-devel@ffmpeg.org>; Thu, 25 Jan 2024 15:44:49 +0200 (EET)
Received: by mail-pl1-f175.google.com with SMTP id
 d9443c01a7336-1d780a392fdso17066005ad.3
 for <ffmpeg-devel@ffmpeg.org>; Thu, 25 Jan 2024 05:44:49 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1706190288; x=1706795088; darn=ffmpeg.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:to:from:from:to:cc:subject:date:message-id
 :reply-to; bh=3MNCGhOxflInXF6wgnUdLZzQcXlRTkyai5jDkctok9I=;
 b=O9R96QnbATWtK6KqKtwu//VEQKmaIu/YHE7S2Jn36ekmUNifcxMNxtEFnUoiovS0TU
 +U6DmA0g3zxe+eLZdFOYTs9LuIxe1tFsjtddyOg4xAucNH/Hr5YdIq6VpwVKlWKInM1M
 tOkeB65vUPulS4G6CKz8huLr+EH6gUHp6H+cuio6dptIwBkfpqt3qhB1F5Z73BP1itx4
 XG2jbKHo1YXL0QBaWIEfHGaG+Nk+fYju8sjR8SMww6srefupgUHbTPa1q2+5zfvaaoOp
 GALYdNW6D0sbq3pS0eTI0Jnkv5vbXLGTRAz1k1ukjw4ZZWiDXVYmnQCRIFesBbzmoumb
 JvIw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1706190288; x=1706795088;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=3MNCGhOxflInXF6wgnUdLZzQcXlRTkyai5jDkctok9I=;
 b=CkIfS7dFmgp+J9TTWrPnxnzvkDJ6B6QHRUOSl18+AVbs11xBBLPHAwjAFBYlbMMTG3
 QD+l5YWVS/U7q6Rd5vHUUKx536kYrBecS9FK0XYt6fO+iSw9W1GpejpKRXCS3kY1szkI
 Ud7FKlneLcInt4y30QxQWAn8aW2ho1BJZgpzjkoDjWX1uUjywE7ICuJUPNKoMTH1Hdhz
 /Th0/y4/kaQ2dQyR0ExNloGI8SjCUUHiBzbWOaLGZL0YUbtI8PbPnzeOis96I0yfvWcb
 RRLpf+ZgfUpALqUfK6vGOxl/MquQmL2kptbxVMqARNdt+FaBStwrjDecRkLxaqs6XNQE
 sMpA==
X-Gm-Message-State: AOJu0YwGvl2C0MvFKuHwFqCy3MBlkgadLditSRuxFliCzRk52WxJ6+y2
 x9GbgnHS5VUvBR5KEf+QPkCoaN9at2KXjl87Lk4Wo1hInk9nq8l21cPMP0e0
X-Google-Smtp-Source: AGHT+IFMnp6XImMANI3c14J9CBkThe+zpAmUr688an7QyHcf2Th2UvzYGi0RXHlDE4ZMXmjEY35Eeg==
X-Received: by 2002:a17:902:d2c2:b0:1d5:e4d6:1e07 with SMTP id
 n2-20020a170902d2c200b001d5e4d61e07mr858287plc.33.1706190287833; 
 Thu, 25 Jan 2024 05:44:47 -0800 (PST)
Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar.
 [190.225.105.197]) by smtp.gmail.com with ESMTPSA id
 k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.46
 for <ffmpeg-devel@ffmpeg.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 25 Jan 2024 05:44:47 -0800 (PST)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 25 Jan 2024 10:43:36 -0300
Message-ID: <20240125134425.374-14-jamrial@gmail.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240125134425.374-1-jamrial@gmail.com>
References: <20240125134425.374-1-jamrial@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 13/24] avutil: remove deprecated
 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20240125134425.374-14-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavutil/fifo.h    | 23 -----------------------
 libavutil/version.h |  1 -
 2 files changed, 24 deletions(-)

diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index ce3a2aed7c..7ac497e8f9 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -416,29 +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.
- *
- * @param f    AVFifoBuffer to peek at, f must be non-NULL
- * @param offs an offset in bytes, its absolute value must be less
- *             than the used buffer size or the returned pointer will
- *             point outside to the buffer data.
- *             The used buffer size can be checked with av_fifo_size().
- * @deprecated use the new AVFifo-API with av_fifo_peek() or av_fifo_peek_to_cb()
- */
-attribute_deprecated
-static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
-{
-    uint8_t *ptr = f->rptr + offs;
-    if (ptr >= f->end)
-        ptr = f->buffer + (ptr - f->end);
-    else if (ptr < f->buffer)
-        ptr = f->end - (f->buffer - ptr);
-    return ptr;
-}
-#endif
 #endif
 
 /**
diff --git a/libavutil/version.h b/libavutil/version.h
index 772c4e209c..a67a51c933 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -105,7 +105,6 @@
  * @{
  */
 
-#define FF_API_FIFO_PEEK2               (LIBAVUTIL_VERSION_MAJOR < 59)
 #define FF_API_FIFO_OLD_API             (LIBAVUTIL_VERSION_MAJOR < 59)
 #define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 59)
 #define FF_API_OLD_CHANNEL_LAYOUT       (LIBAVUTIL_VERSION_MAJOR < 59)
-- 
2.43.0

_______________________________________________
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".