diff mbox series

[FFmpeg-devel,13/24] avutil: remove deprecated FF_API_FIFO_PEEK2

Message ID 20240125134425.374-14-jamrial@gmail.com
State Accepted
Commit 43c62b11aa9fc1c2cebc5b10c96bb546127fa2e2
Headers show
Series Major library version bump | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer Jan. 25, 2024, 1:43 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavutil/fifo.h    | 23 -----------------------
 libavutil/version.h |  1 -
 2 files changed, 24 deletions(-)
diff mbox series

Patch

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)