Commit 86e5d7ad authored by diego's avatar diego

Drop deprecated av_fifo_write function with the next libavutil version bump.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16782 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e2c174f2
...@@ -74,10 +74,12 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { ...@@ -74,10 +74,12 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
return 0; return 0;
} }
#if LIBAVUTIL_VERSION_MAJOR < 50
void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size) void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
{ {
av_fifo_generic_write(f, (void *)buf, size, NULL); 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)) int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
{ {
......
...@@ -72,6 +72,7 @@ int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size); ...@@ -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); 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. * Writes data into an AVFifoBuffer.
* @param *f AVFifoBuffer to write to * @param *f AVFifoBuffer to write to
...@@ -79,6 +80,7 @@ int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void ...@@ -79,6 +80,7 @@ int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void
* @param size data size * @param size data size
*/ */
attribute_deprecated void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int 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. * Feeds data from a user supplied callback to an AVFifoBuffer.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment