Drop deprecated av_fifo_write function with the next libavutil version bump.

Originally committed as revision 16782 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 518fba2..12c6534 100644 (file)
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -74,10 +74,12 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
     return 0;
 }
 
+#if LIBAVUTIL_VERSION_MAJOR < 50
 void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
 {
     av_fifo_generic_write(f, (void *)buf, size, NULL);
 }
+#endif
 
 int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
 {

diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index 93756e9..7901972 100644 (file)
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -72,6 +72,7 @@ int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size);
  */
 int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest);
 
+#if LIBAVUTIL_VERSION_MAJOR < 50
 /**
  * Writes data into an AVFifoBuffer.
  * @param *f AVFifoBuffer to write to
@@ -79,6 +80,7 @@ int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void
  * @param size data size
  */
 attribute_deprecated void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size);
+#endif
 
 /**
  * Feeds data from a user supplied callback to an AVFifoBuffer.