[FFmpeg-devel] [PATCH 1/3] lavu/fifo: remove FF_API_FIFO_PEEK2

[Anton Khirnov]

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)
-- 
2.35.1