diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-19 22:15:05 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-19 22:15:05 +0000 |
| commit | e8e2b2ef171353dc593f41d7c4d5cdb11541e109 (patch) | |
| tree | 3f192d0977e5d0f11a2f670918cbd075bf3a7918 | |
| parent | fda0d4afa77c865dc53a4352ddd12e981ccfdf39 (diff) | |
| download | ffmpeg-e8e2b2ef171353dc593f41d7c4d5cdb11541e109.tar.gz | |
Deprecate av_fifo_realloc(). av_fifo_realloc2() should be used instead.
Originally committed as revision 14855 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/fifo.c | 2 | ||||
| -rw-r--r-- | libavutil/fifo.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 19715ebce4..b9a87835c2 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -51,12 +51,14 @@ int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size) return av_fifo_generic_read(f, buf_size, NULL, buf); } +#if LIBAVUTIL_VERSION_MAJOR < 50 /** * Resizes a FIFO. */ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) { av_fifo_realloc2(f, new_size); } +#endif int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { unsigned int old_size= f->end - f->buffer; diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 2384f7021f..f35ccc348a 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -93,13 +93,15 @@ attribute_deprecated void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int */ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int)); +#if LIBAVUTIL_VERSION_MAJOR < 50 /** * Resizes an AVFifoBuffer. * @param *f AVFifoBuffer to resize * @param size new AVFifoBuffer size in bytes * @see av_fifo_realloc2() */ -void av_fifo_realloc(AVFifoBuffer *f, unsigned int size); +attribute_deprecated void av_fifo_realloc(AVFifoBuffer *f, unsigned int size); +#endif /** * Resizes an AVFifoBuffer. |