From patchwork Thu Jan 25 13:43:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8888:b0:199:de12:6fa6 with SMTP id d8csp81649pzf; Thu, 25 Jan 2024 05:46:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHtDwGrwa5SqUOT8E+13ja/v6LE6oPnqNCrVjS9TY37oZARJCmbs1TU+7vm1OtQJjHbXHD X-Received: by 2002:a17:906:f989:b0:a30:4726:eabd with SMTP id li9-20020a170906f98900b00a304726eabdmr1158754ejb.3.1706190408822; Thu, 25 Jan 2024 05:46:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706190408; cv=none; d=google.com; s=arc-20160816; b=pjSMjmQxqGCj108qZs7mVf3U4q82hH/zlh7BuIgurFx8EFFhziHDajVKI6qW3KOla4 i68d9FkvgL37KC6kkG80JTDEx4udeNu88EsRFVp6UlU0nfZvdI/7hOUYKjpf5EUb4nn+ 55H5KGu7kbh64qk6a68u9bLXGydC9eHj4DNkHSCnJmepAbglN7n/YOx5rtfSZaB5fTk8 nSPGTXLIlFCm1oH3gj76uXVMK8l/o4d4+ilq1dBjceXacn7U2qpU1wYEkSx0J9nX8Pfk ec1uq2BEruPo0Ou8M1/6zuongjHMFq/hxyECeRiQxLitDqn6LMNLqW0TcQ/a/7l26MuS ILuA== 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:dkim-signature:delivered-to; bh=jrugWOQTQv0BxFoNxQm8S4NAnVjEJUL4s5ZuMXgQAZY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=NmhSslRWr/9W7JkWKFTodLSUeWfVIIVF32pPzZ9T9FuG1DlGLVvOMJDjdZSyZh5C3i ZozfTIL53jdSX8hSjsA8K5/A5oK2JQiHFDur/MZAlX59yUt6amH1ds3oJJwHXXjjs3Wt ciXlSeeEw9f74sf2lT0BDopbmrJY9eZCDQWxxCzWi4yGvGOZiLSBZB0OrsuL7IOjcuvk DRKd1/v5kBwMDjWynSo7i+P5gmlOK0EFMmQjbOoJEf3ShjNr8lzhZZwctlFIRkxMcCwm aDSBMLH4uoM/OC+1fIRrwWjGkA2Xt04Uqvrwu/8HZ3/M5ZUR/I7WBV5RlQmKZvERFu7b cutQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=O9R96Qnb; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kl23-20020a170907995700b00a2d1aad8686si985971ejc.436.2024.01.25.05.46.48; Thu, 25 Jan 2024 05:46:48 -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=@gmail.com header.s=20230601 header.b=O9R96Qnb; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C2AC68D180; Thu, 25 Jan 2024 15:44:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 ; Thu, 25 Jan 2024 15:44:49 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d780a392fdso17066005ad.3 for ; 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-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 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:47 -0800 (PST) From: James Almer 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 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: mN8o4bsJeEPo Signed-off-by: James Almer --- 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)