summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-01-25 19:22:47 +0000
committerDiego Biurrun <diego@biurrun.de>2009-01-25 19:22:47 +0000
commit5090122f906d13a8bd02ade4f1d39f1fb8ac3321 (patch)
tree841b9d3dd6a4afe04053f140b4c3c7e6b3269b1c /libavutil
parent4ce9492339b2313fcc52b7d572b6e167fe6b8c11 (diff)
downloadffmpeg-5090122f906d13a8bd02ade4f1d39f1fb8ac3321.tar.gz
Drop deprecated av_fifo_write function with the next libavutil version bump.
Originally committed as revision 16782 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/fifo.c2
-rw-r--r--libavutil/fifo.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 518fba24c6..12c6534cf7 100644
--- 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 93756e92c9..7901972968 100644
--- 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.