[FFmpeg-cvslog] lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Anton Khirnov
git at videolan.org
Tue Oct 23 15:04:52 CEST 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Oct 22 14:40:32 2012 +0200| [00ed7f5958d026cb4786919f4b3e46f14fe608bf] | committer: Anton Khirnov
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00ed7f5958d026cb4786919f4b3e46f14fe608bf
---
libavutil/fifo.h | 11 -----------
libavutil/version.h | 3 ---
2 files changed, 14 deletions(-)
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index e670175..ea30f5d 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 b781751..ae7fa7a 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
More information about the ffmpeg-cvslog
mailing list