diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-20 10:57:22 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | 43c62b11aa9fc1c2cebc5b10c96bb546127fa2e2 (patch) | |
| tree | 8f82b68b232281db4302d6e951982047c33ae5ed | |
| parent | e58afae1e4035c109a4178579304da00a2fe89fb (diff) | |
| download | ffmpeg-43c62b11aa9fc1c2cebc5b10c96bb546127fa2e2.tar.gz | |
avutil: remove deprecated FF_API_FIFO_PEEK2
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/fifo.h | 23 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
2 files changed, 0 insertions, 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 3fbc292a68..e2281acaec 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) |