From patchwork Mon Feb 24 12:37:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 17904 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C13B144A135 for ; Mon, 24 Feb 2020 14:39:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB79468B4D7; Mon, 24 Feb 2020 14:39:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B953F68B3E7 for ; Mon, 24 Feb 2020 14:39:19 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 785F0295126 for ; Mon, 24 Feb 2020 13:39:19 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id jrVV5Oe7Nk_A for ; Mon, 24 Feb 2020 13:39:19 +0100 (CET) Received: from quelana.khirnov.net (unknown [IPv6:2002:b061:f0a:201:5e:e696:5100:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) client-signature RSA-PSS (2048 bits)) (Client CN "quelana.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 7CE842951AA for ; Mon, 24 Feb 2020 13:39:18 +0100 (CET) Received: from localhost (quelana.khirnov.net [IPv6:::1]) by quelana.khirnov.net (Postfix) with ESMTP id 342CD2522B for ; Mon, 24 Feb 2020 13:39:18 +0100 (CET) Received: from quelana.khirnov.net ([IPv6:::1]) by localhost (quelana.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id MgwUcB9OAtMe for ; Mon, 24 Feb 2020 13:39:17 +0100 (CET) Received: from libav.daenerys.khirnov.net (libav.daenerys.khirnov.net [IPv6:2a00:c500:561:201::7]) by quelana.khirnov.net (Postfix) with ESMTP id 6F7882522D for ; Mon, 24 Feb 2020 13:39:14 +0100 (CET) Received: by libav.daenerys.khirnov.net (Postfix, from userid 1000) id DF42820E0353; Mon, 24 Feb 2020 13:39:10 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Feb 2020 13:37:29 +0100 Message-Id: <20200224123739.31154-3-anton@khirnov.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200224123739.31154-1-anton@khirnov.net> References: <20200224123739.31154-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/12] fifo: hide the definition of AVFifoBuffer in next+1 major bump X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" There is no reason whatsoever for it to be public. --- libavutil/fifo.c | 9 +++++++++ libavutil/fifo.h | 8 ++++++-- libavutil/tests/fifo.c | 2 +- libavutil/version.h | 3 +++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 0baaadc521..f58530a26e 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -25,6 +25,15 @@ #include "fifo.h" #include "version.h" +#if !FF_API_FIFO +struct AVFifoBuffer +{ + uint8_t *buffer; + uint8_t *rptr, *wptr, *end; + uint32_t rndx, wndx; +}; +#endif + static AVFifoBuffer *fifo_alloc_common(void *buffer, size_t size) { AVFifoBuffer *f; diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 8cd964ef45..6c0e806c80 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -29,11 +29,15 @@ #include "attributes.h" #include "version.h" -typedef struct AVFifoBuffer { +typedef struct AVFifoBuffer +#if FF_API_FIFO +{ uint8_t *buffer; uint8_t *rptr, *wptr, *end; uint32_t rndx, wndx; -} AVFifoBuffer; +} AVFifoBuffer +#endif +; /** * Initialize an AVFifoBuffer. diff --git a/libavutil/tests/fifo.c b/libavutil/tests/fifo.c index 8a550e088b..5982d63bba 100644 --- a/libavutil/tests/fifo.c +++ b/libavutil/tests/fifo.c @@ -18,7 +18,7 @@ #include #include -#include "libavutil/fifo.h" +#include "libavutil/fifo.c" int main(void) { diff --git a/libavutil/version.h b/libavutil/version.h index 90cc55b9ac..c271e85d29 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -129,6 +129,9 @@ #ifndef FF_API_PSEUDOPAL #define FF_API_PSEUDOPAL (LIBAVUTIL_VERSION_MAJOR < 57) #endif +#ifndef FF_API_FIFO +#define FF_API_FIFO (LIBAVUTIL_VERSION_MAJOR < 58) +#endif /**