diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-10-22 14:40:32 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-23 07:33:05 +0200 |
| commit | 00ed7f5958d026cb4786919f4b3e46f14fe608bf (patch) | |
| tree | 95d9364a7e0bdf11a4e8aff56ca44d82508da6e0 | |
| parent | c692957c4edd119920cd7f2121628dd183589e6a (diff) | |
| download | ffmpeg-00ed7f5958d026cb4786919f4b3e46f14fe608bf.tar.gz | |
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
| -rw-r--r-- | libavutil/fifo.h | 11 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/libavutil/fifo.h b/libavutil/fifo.h index e670175a76..ea30f5d2bd 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -128,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 */ diff --git a/libavutil/version.h b/libavutil/version.h index b781751043..ae7fa7abeb 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -61,9 +61,6 @@ * @{ */ -#ifndef FF_API_AV_FIFO_PEEK -#define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) -#endif #ifndef FF_API_PIX_FMT #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #endif |