avutil: remove deprecated FF_API_FIFO_PEEK2
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
e58afae1e4
commit
43c62b11aa
@ -416,29 +416,6 @@ int av_fifo_grow(AVFifoBuffer *f, unsigned int additional_space);
|
|||||||
attribute_deprecated
|
attribute_deprecated
|
||||||
void av_fifo_drain(AVFifoBuffer *f, int size);
|
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
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 59)
|
||||||
#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 59)
|
#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 59)
|
||||||
#define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 59)
|
#define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 59)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user