avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

[ffmpeg] / libavutil / fifo.h

diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index 961463a2a4cc28d9a2a4ac5f05df29eb3b5629a4..ea30f5d2bdd0f0fd944e652a434f6dd14cb799c6 100644 (file)
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include "avutil.h"
+#include "attributes.h"
 
 typedef struct AVFifoBuffer {
     uint8_t *buffer;
@@ -111,7 +112,7 @@ void av_fifo_drain(AVFifoBuffer *f, int size);
  * 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 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.
@@ -127,15 +128,4 @@ static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs)
     return ptr;
 }
 
-#if FF_API_AV_FIFO_PEEK
-/**
- * @deprecated Use av_fifo_peek2() instead.
- */
-attribute_deprecated
-static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
-{
-    return *av_fifo_peek2(f, offs);
-}
-#endif
-
 #endif /* AVUTIL_FIFO_H */